merge of 'a11f318a90beef34d84711b348b891eddfabc2bf'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:08:05 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:08:05 +0000 (12:08 +0000)
commit97cdde9f9344eaeb369b3f3cb4dce4ec0254b5e6
tree23212a4a1bbe8ffa22bbd7c27074cb83c693acf4
parent8276d6ef3f035028322f1063c98b9717cd80db09
parentc665c146f949fb40806285277e65c6bfc4fa1c23
Merge ... 'a11f318a90beef34d84711b348b891eddfabc2bf'
     and 'a4b1e7b65833194a48909d836e87a913dbbe3c66'