Merge tag 'upstream/2_rc2+svn382' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 25 Mar 2012 18:34:27 +0000 (21:34 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 25 Mar 2012 18:34:27 +0000 (21:34 +0300)
commit295a4c3cf3a9b816352abc64bf5c91b57438597a
tree7fb5a4582b9fbed69ed8434d7848c155f48a4930
parent88b91c794f318ce84d793bfe316335bfa4346c17
parenta69bf2d744b5fc1791b56b455586f95fa20b25c5
Merge tag 'upstream/2_rc2+svn382' into experimental

Upstream version 2~rc2+svn382