Merge branch 'master' into rc-0-9
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Sun, 27 Mar 2011 21:32:31 +0000 (23:32 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Sun, 27 Mar 2011 21:32:31 +0000 (23:32 +0200)
commit260525a7542fee73c90c0b03dcf1ab8a4ee87a40
tree523ba069e4f25ef02b4a292fadbc5101b65fb6bf
parente2881cb30634faf70fe114d442263afcda870646
parentbdf07f837e4ca71d79acfc69e7bd3855f2cab837
Merge branch 'master' into rc-0-9