merge of 'dd31500500238107a50637418ba3f63cb4b36a7d'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 14:22:33 +0000 (14:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 14:22:33 +0000 (14:22 +0000)
commit29df4969217a8faef58eabdca8b8cf215eb4ae1a
treec3c99b016c1cb7fdb50014ef5ef42a2f841245e4
parentf64e6f6de73bce19dfcd982892a2e138e09514fc
parent82e513bd251890b72e83dd95be772f15462ad9ea
Merge ... 'dd31500500238107a50637418ba3f63cb4b36a7d'
     and 'fd51b44f85d35014e5287bedc536e9abcbf56cad'