Merge branch 'master' into maint
commit3e98fb41833b50b4db508407b7a0677e6558a92b
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 20 Jul 2010 14:06:35 +0000 (20 16:06 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 20 Jul 2010 14:06:35 +0000 (20 16:06 +0200)
tree3510eb18c4a949c259c6ad975711563c4afacb54
parent12ec6bd15a4e29df366771e06445b12317250560
parent4fce79a04aa922643e728a58586056cb6fdcd23a
Merge branch 'master' into maint