merge of '716838c61d439ea48ec596bb358e6fe8674c26fe'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 15:54:10 +0000 (15:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 15:54:10 +0000 (15:54 +0000)
commit0ea2a3eacf6bd7f2bd8be28db697fa3c6c8fb2dd
treeb27715ea5bc2af8cfdfee8afba9947e732f2e126
parent76a92660f68f46dd4e91811ede1de9db6e609da2
parentebcfc2917b588f690f45d40a0dae97ab5bb2543c
Merge ... '716838c61d439ea48ec596bb358e6fe8674c26fe'
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'