Merge tag 'upstream/2_rc2+svn403' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 8 Apr 2012 19:46:00 +0000 (22:46 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 8 Apr 2012 19:46:00 +0000 (22:46 +0300)
commit9c6343b4ba58de05f8b6114bbc218a6718d4aead
tree37699ab0cfd8eb85fa8620e084cd0a55a805157e
parent479cc3bc5fffa1ca87fd6afc5e1dda08598b5569
parent9c74875b4df31efb381355be7723b39c6a63f109
Merge tag 'upstream/2_rc2+svn403' into experimental

Upstream version 2~rc2+svn403