Merge tag 'upstream/2_rc2+svn364' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 16:50:11 +0000 (18:50 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 16:50:11 +0000 (18:50 +0200)
commitcaa511965557b098bbc21a9c575aac1e153021e9
treea8dffcb2f8de8988ad14c42e69abd1f4528feee4
parentb27afc243ae50a1051fc53d60560c9f882b05b45
parent47514014f880ef964250aaa8d62f169db25355b2
Merge tag 'upstream/2_rc2+svn364' into experimental

Upstream version 2~rc2+svn364