Merge tag 'upstream/2_rc2+svn378' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Mar 2012 09:03:50 +0000 (11:03 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Mar 2012 09:03:50 +0000 (11:03 +0200)
Upstream version 2~rc2+svn378


Trivial merge