Merge mainline changes
commit878e181f6eb85107ea0e068160f61ef02ad468d4
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 12 Mar 2013 07:30:11 +0000 (12 08:30 +0100)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 12 Mar 2013 07:30:11 +0000 (12 08:30 +0100)
tree1bd3412e4d14870870adbadc5210e033a3e2a346
parent7f25c4e9da012f7d3387d095172d979087ec8173
parent623bab8f043f0e60c5e6d04af58ed83d9338327b
Merge mainline changes