merge of '4b947022d295cf54343e477171aae5c39c73865f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 21:20:30 +0000 (21:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 21:20:30 +0000 (21:20 +0000)
commitaabbfd91b7bfa305d450b62d3e8405d3cea0d3d0
treefc88e653a28dbcde3b8d7a4c78837fd72868abbb
parent06c755eb8ea36b4334d91ce8a39da512cbc26ed8
parent678383297cbd1a8d8d59030a3024cf5ac93ae295
Merge ... '4b947022d295cf54343e477171aae5c39c73865f'
     and '59ea48e552117b87f1c03767f7f608bf3e852fc4'