merge of '19595382c19aadeee7dac4939deb285a05e428eb'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Feb 2008 23:36:10 +0000 (23:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 3 Feb 2008 23:36:10 +0000 (23:36 +0000)
commit1a0f697a1edde61c30b8606430f1417e6dcc4931
tree5bba2cd845e21e74afe215421a07dd875692a53f
parent67ee8c0ad8aebfb5b8bd81ee37380bffa72ba9bc
parent4f3ab3fe8e081cb25ca124f55ff2c21e6dd4072a
Merge ... '19595382c19aadeee7dac4939deb285a05e428eb'
     and '31ced983465ce39a8b2be69de54096ba17a8b404'