merge of '855419893670eddd4f74cc406e9264cde751254c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 16:24:38 +0000 (16:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 16:24:38 +0000 (16:24 +0000)
commitd00bf954b34e300bea661af0f7d6b18a4043c6ec
tree48629f9d66582f3cee7e46d3809e7edaa2e0659d
parentc9f59aca1e53304c3904a4036db610c79fd29f81
parentefcbba753578d97f18029bf48ae41947f4c54bcc
Merge ... '855419893670eddd4f74cc406e9264cde751254c'
     and 'b57b6f67dc82434a153a6f60215a283ac096b584'