Merge tag 'upstream/2_rc2+svn361' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 11 Mar 2012 07:17:00 +0000 (09:17 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 11 Mar 2012 07:17:00 +0000 (09:17 +0200)
commit6e7b0558b5ca4af6365e49141f2c8b041b8d4c0a
tree3e8ea6682c20ca3f9c449dea57f9e9eaedc5c9ee
parent4263c3e73928dc59b930fd33327786aad85fa22f
parent1fba52225ed96cd2bb0e4b67fea903837f341c17
Merge tag 'upstream/2_rc2+svn361' into experimental

Upstream version 2~rc2+svn361