merge of '2d845d0c3ff5c2927314d27ea9825e38bb773f6f'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 19:08:53 +0000 (19:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 19:08:53 +0000 (19:08 +0000)
commit8ccc8811ca307fa74f6bfb1546a3f636c42807d4
tree70b7140c04f3ac30037888d8dad804153742a91f
parent8692e137c96be6c3111dbe1f7f2c62996323c037
parent7726e44db70e81e626d612f968e980974c43ca60
Merge ... '2d845d0c3ff5c2927314d27ea9825e38bb773f6f'
     and '94f444b248e2cbc069ea3e5f2d467b3632db5d8c'