merge of '8fdaa25fd43ec0cd83b190b8b345a620111e66b9'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:18:23 +0000 (23:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:18:23 +0000 (23:18 +0000)
commitd0519d4132b3c49a2ab877f335900db8e0ae00d2
tree02622428166b5d7c18723b3f14f9788226ac6aab
parent9abaca9766e0056c5b78ad445f95ef5712459a96
parent1ddab4d3cfe780f1f70716491965bf38f74b8f4e
Merge ... '8fdaa25fd43ec0cd83b190b8b345a620111e66b9'
     and 'de7f15da3dcec92630db3a43f280fdfa55e08a88'