merge of 'bee9775a7c7c9473463045701aaa9f372e1173ce'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 17:22:03 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 17:22:03 +0000 (17:22 +0000)
commit5e1885864131228640a0e2f4b0fd5fba72df00e1
treed662ab54c27e5110d5a54b03589b404d66671858
parentee705b5424ac031a689a321dd7636a60a9910871
parentbbab4fefb488391e2b40f6a3cbb39ced9a8905ce
Merge ... 'bee9775a7c7c9473463045701aaa9f372e1173ce'
     and 'e65ed9e5ef27495a6e0a27b271aaeb16c87cc317'