Merge tag 'upstream/2_rc2+svn362' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 13 Mar 2012 12:41:07 +0000 (14:41 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 13 Mar 2012 12:41:07 +0000 (14:41 +0200)
Upstream version 2~rc2+svn362


Trivial merge