merge of '3d704269a4c9fd224a47e37d4d32b325354912cd'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 Sep 2008 16:17:53 +0000 (16:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 17 Sep 2008 16:17:53 +0000 (16:17 +0000)
commita6b0d5898e3e33f8d26b03cf06b9c22208d32e3d
tree7c7c3f85c867f7a70ca3b9bfbe8a148412930346
parent5be9f10d42352435ff5ce3152ad1decf7c85bd1c
parente2fda405250f282dbf290b357264bda1e1f62469
Merge ... '3d704269a4c9fd224a47e37d4d32b325354912cd'
     and '4872b30764f9d90796ac966d1616d34ec0eceff9'