merge of 'c05229a8c5246cada336c3cfe5a3417367366836'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Aug 2008 17:40:05 +0000 (17:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Aug 2008 17:40:05 +0000 (17:40 +0000)
commit6760f8efc93922a44d225129143387c37d760f1b
tree87a45538f5b3d1141983af8c72c3335cb356e6fc
parentae09040e845e88874bfce7613ae34a6ae183df7f
parentc4654869732909f4dc1c043ea0cce71537e89d3f
Merge ... 'c05229a8c5246cada336c3cfe5a3417367366836'
     and 'ef9cb35b2ec71124443e3492f55fe842c40ba66e'