merge of 'b8e71a10da8ae7461c4c3197576a05bcda913299'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 13:25:44 +0000 (13:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 17 Sep 2007 13:25:44 +0000 (13:25 +0000)
commit03c6462105b790e7a7229e5e41c7db34a7308665
tree2fd5a41e01ca65d335f195fc67ec8865ecd0c198
parentc68420a7efd8d477e64b4432dce11f3aee3bbcd2
parent496aea4722ae98806904e2ada55a779ee956ec51
Merge ... 'b8e71a10da8ae7461c4c3197576a05bcda913299'
     and 'e693b2bf0018d4d35c75103648c29805e597c2c9'