Merge tag 'upstream/2_rc2+svn383' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Mar 2012 14:33:52 +0000 (17:33 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Mar 2012 14:33:52 +0000 (17:33 +0300)
Upstream version 2~rc2+svn383


Trivial merge