Merge branch 'master' into rc-0-8
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 29 Jul 2010 15:28:55 +0000 (17:28 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 29 Jul 2010 15:28:55 +0000 (17:28 +0200)
commit912329971357e2fbfa5a9713291d95cf3d30aedf
tree680e3d367d58818b13d5316655852f44f5babb69
parenta472750a11a0d626d38111f51d0c71fee376572e
parent3c68630b6cb1871abe91c3c7c7cdf137fd62b83d
Merge branch 'master' into rc-0-8