merge of 'aeb1ac8ac964032ee256054d8009fd226a984570'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 15:58:45 +0000 (15:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 15:58:45 +0000 (15:58 +0000)
commitb8c7c4f3c4a4606a69cc8e11f7bfad0b9a0dede8
treed638d5ecbb56c097cb9f8443d5b7d893d8267f6b
parentbc0a9c0cfe9156269d7cc1af8b808be7d31e8094
parent996bfb248d59b24e4f3db2269e4128bef4b7bf37
Merge ... 'aeb1ac8ac964032ee256054d8009fd226a984570'
     and 'b86db14f5edd4f268d21ba089697b479d09548ce'