Merge mainline changes
commit33fee91ab410e7ce179f5a2b40093b1e7360647a
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Fri, 31 Aug 2012 07:35:27 +0000 (31 09:35 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Fri, 31 Aug 2012 07:35:27 +0000 (31 09:35 +0200)
tree0b5c6f25f5e7134bdea8e48629825fcba62c6651
parent72cf06404efaa285aa890f576aa2963586dcc7ef
parent0d57c3e8dc226ff58ff9c31e8727d5319cd44bf5
Merge mainline changes