Merge tag 'upstream/2_rc2+svn382' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 25 Mar 2012 18:34:27 +0000 (21:34 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 25 Mar 2012 18:34:27 +0000 (21:34 +0300)
Upstream version 2~rc2+svn382


Trivial merge