Merge tag 'upstream/2_rc2+svn378' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Mar 2012 09:03:50 +0000 (11:03 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Fri, 23 Mar 2012 09:03:50 +0000 (11:03 +0200)
commiteca0cb4781d4adbdf7bfbfaf7c431bd78ec3cb3e
tree841de78033d1daad6a35900f670c9638ca59f0f5
parent9646b189665a2df9aac025019de2f2fe0395fc64
parentd0f90bdb556cde097039750f85a6c89d58aacc5c
Merge tag 'upstream/2_rc2+svn378' into experimental

Upstream version 2~rc2+svn378