Merge mainline changes
commit4b824457e99e96b4e0176beb18eabdc25b8895da
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Sun, 13 May 2012 11:13:09 +0000 (13 13:13 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Sun, 13 May 2012 11:13:09 +0000 (13 13:13 +0200)
treecabb01450aa7fbbd0b6378fee742df9bcd6f8eaf
parent738b549ba5c1b98bef3c6232df7b8771066de0cf
parent84c86819e89c5123c0909175389065ca6285ffb9
Merge mainline changes