merge of '6effd4b98afa326e66d32ef10490967c420727f4'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 16:56:55 +0000 (16:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 16:56:55 +0000 (16:56 +0000)
commitd8cb2309a8149708076e3688809f98f67254c03e
tree02a53868f00ddc1756ab82c875c9631e176c47e0
parent1b5750ccf37250a55b95e42b64fb4d952202057d
parent9054b073f4b1a8a70954bfbc599aa0c24808a13d
Merge ... '6effd4b98afa326e66d32ef10490967c420727f4'
     and 'd081501ea9f95cb4ffb0c033c9a4f1b0cef84220'