Merge mainline changes
commit85d2fe2e5b85f71ad9664a96db7ed7302e0f9f2b
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Sat, 7 Apr 2012 16:37:05 +0000 (7 18:37 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Sat, 7 Apr 2012 16:37:05 +0000 (7 18:37 +0200)
treebd456d83a9c43d671ae923018b3d43126ea301a5
parentec351c34d297ad72deb117c5a95ad1d66aee5f3f
parent6bb169b5888edb060801d4ac1ed89a86670dd67a
Merge mainline changes