Merge mainline changes
commitc4b03177549f766cfce1b9215eeb1cdb1129499d
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Fri, 18 May 2012 08:14:19 +0000 (18 10:14 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Fri, 18 May 2012 08:14:19 +0000 (18 10:14 +0200)
treee78e2b419a033158ee83b4f9e0e3064813c3f6ae
parent8f6bffdd5f07c465191c6c37d5347f89fc317817
parent3e67ab12bbb2df2b1ef285b00f3b1336a5d82d17
Merge mainline changes