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)
commitfe7f9485ad01af87957a88094478dcf252deda0e
tree9496fa50d2ce829736804380cc7888234b023cc3
parent5263820007b7c656aa31c59ded45dc6865d5eb01
parentf5a32dbb658de68467343ff8c5fc3cdd2403f982
Merge tag 'upstream/2_rc2+svn368' into experimental

Upstream version 2~rc2+svn368