merge of '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 5 Sep 2008 12:18:52 +0000 (12:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 5 Sep 2008 12:18:52 +0000 (12:18 +0000)
commit84872c649ca3c08ffa3a3953a64cf26b9ef3014e
treea260fe17bac1599dc7b6b2d1ccbe47bd83a88b95
parent2a13f636bc70c21dda37b3ba3e7a421a16689694
parentdb7e7a4c82b05d6913ad472f69696a085524030d
Merge ... '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'
     and 'db7aa3c67ff99859a56b540059d1f21cc95da4b5'