Merge tag 'upstream/2_rc2+svn361' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 11 Mar 2012 07:17:00 +0000 (09:17 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 11 Mar 2012 07:17:00 +0000 (09:17 +0200)
Upstream version 2~rc2+svn361


Trivial merge