Merge tag 'upstream/2_rc2+svn403' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 8 Apr 2012 19:46:00 +0000 (22:46 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 8 Apr 2012 19:46:00 +0000 (22:46 +0300)
Upstream version 2~rc2+svn403


Trivial merge