merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 10:56:02 +0000 (10:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 10:56:02 +0000 (10:56 +0000)
commitb016f9c2bd40fdcafd2ffeb563164ab08e80780c
tree975bdba5c43fed8120dda77ae465958e7ca7a6e5
parent8abdbf47bf643b97ddcc5b8b8774ef67c252c1d4
parentb8826e4bdbacd31e6086dffc212fd435fddd0128
Merge ... '4691fac16318391e3125e1a88e96b9003fa1c4f0'
     and '9934077f8cc45499fe70c414041ee257c6f7b98d'