merge of '607beb16c902d30bfd6adf75220b877b5611180c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:58:25 +0000 (08:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:58:25 +0000 (08:58 +0000)
commit0b68cb398afdb41c872591e7877fb85b4f600871
tree9a70e3110a47d4801e9b62b7c7d19e7a7aa8a857
parent0528da9a31a5dc67f47c02be2b2b64fe0aca1f4a
parente0a250c30d978c85e8f6e63cb3940061d906730d
Merge ... '607beb16c902d30bfd6adf75220b877b5611180c'
     and 'a6836b405b63dd6c48b68274fbcb3c25bdde6c3e'