Merge tag 'upstream/2_rc2+svn359' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 9 Mar 2012 22:03:38 +0000 (00:03 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 9 Mar 2012 22:03:38 +0000 (00:03 +0200)
Upstream version 2~rc2+svn359


Trivial merge