Merge tag 'upstream/2_rc2+svn364' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 16:50:11 +0000 (18:50 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 16:50:11 +0000 (18:50 +0200)
Upstream version 2~rc2+svn364


Trivial merge