Merge tag 'upstream/2_rc2+svn368' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 16 Mar 2012 17:25:20 +0000 (19:25 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 16 Mar 2012 17:25:20 +0000 (19:25 +0200)
Upstream version 2~rc2+svn368


Trivial merge