merge of '6fb81274c29757880096f072fe570dfb0c670634'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Mar 2008 10:03:48 +0000 (10:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 26 Mar 2008 10:03:48 +0000 (10:03 +0000)
commit0ba1b284a1d780c7c2948cb994e53d607d124611
tree9692bf60f9b7c79d1f85156d59d2c7d65f719af4
parent64b5ffe862c4eb0dded66fa088003a76b38780bc
parent47cd69d831acf1aeafc95f40ec5deb1db077c592
Merge ... '6fb81274c29757880096f072fe570dfb0c670634'
     and '98e87503fb19f28515c87f377b4b0723e00bc635'