Merge tag 'upstream/2_rc2+svn360' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 10 Mar 2012 14:23:00 +0000 (16:23 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 10 Mar 2012 14:23:00 +0000 (16:23 +0200)
commit64a987a522daf82f58e698cf8d94f92d93dcd543
tree1f9c94c178fa5bed83627afc38982b2f5628032f
parent3ddb8697f7e2878d5df419ed837ab1df9a1687bb
parent5cf3c7076e798d6c9aa5f4baa5602e3420c3fe3f
Merge tag 'upstream/2_rc2+svn360' into experimental

Upstream version 2~rc2+svn360