merge of '0a4c4e919413e2fd4aff39b1053c41c247b9c30f'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 13:24:59 +0000 (13:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 2 Jul 2008 13:24:59 +0000 (13:24 +0000)
commitbb8916484f8df71fec0cf59c4352f72cc5b84819
tree92310c87764ba4639b2d95102951cb4101b61f9c
parentdc6491d82fdb67ad1cd3ab2c65bac7f17f5a07eb
parente569eb9f01a6550dac48cf0e88c6c3834c7744f3
Merge ... '0a4c4e919413e2fd4aff39b1053c41c247b9c30f'
     and 'f63d89980b66ed036447c254c9d7b544d095d25a'