merge of 'a07d4d282b6b37f678fc49a34df91913a6091590'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:32 +0000 (20:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:32 +0000 (20:17 +0000)
commitebdd4e7ae4c38490edb87cedab20580e06edf0f3
tree658e8c069ba5914c25491acb0ca1342f570cf788
parent481af4c81f80bf2e6c9ffc8df84b1a7f3d00dac8
parent44b64c7d077ad1b2223a6b40503c46b9b98ef7de
Merge ... 'a07d4d282b6b37f678fc49a34df91913a6091590'
     and 'ca9bc5017aabbeb9a9266eeaf1f812f66b7956fc'