merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jan 2008 23:55:54 +0000 (23:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jan 2008 23:55:54 +0000 (23:55 +0000)
commit939f5d55c0e4e5d9b9f04f341c848cec4e226d6b
tree5188223fbada2e2262834fbfd5da27ba52a2731e
parent62b156a0fef7fdb309a6d6cb0291ccd5b49a443e
parentbb3cd6d33b47a8aa00ad8dbef0411a7721720872
Merge ... '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
     and 'f556521018478109967b108bb830f8109aefbb0e'