merge of '112ba3baa73bf6c445009481cef0ee0f5371e549'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 21:50:29 +0000 (21:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 21:50:29 +0000 (21:50 +0000)
commitfa6500797b94e356b2840da4edd80c315e30b884
treef27acf9e41be7741a0102cdca2bd61ad80554adc
parentb462976e0ef490fecdc6427d1cb5bb58ea0d7b51
parent5778b1ceca452a9230386c0497c9522997d2ffcf
Merge ... '112ba3baa73bf6c445009481cef0ee0f5371e549'
     and 'baa34221f43a077c05372f6d2f1e4931e764d666'