merge of '7f726014d804dac37f882d802eea690ed0c00cee'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 14:06:47 +0000 (14:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 14:06:47 +0000 (14:06 +0000)
commitc67e3327ee97255fda3143a7a013b210d3e614a2
treeb92ee5c63171a8ca7531b2cb1c7b8a384abd1941
parent6b4d2b41bee7ee874d6f47bdb599cdbfadabf46c
parent5a63543f4b1e8651f3665a89748676a5794f59fe
Merge ... '7f726014d804dac37f882d802eea690ed0c00cee'
     and 'de1ed6b33382c6e5abd3af8087cf833ca9a9c78b'