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)
Upstream version 2~rc2+svn360


Trivial merge