merge of '49c84354677555417bff9c94bd9bb6ada73a166c'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 12:58:46 +0000 (12:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 12:58:46 +0000 (12:58 +0000)
commitb580df8e512127d49a86219b981e57997c04e253
tree0648d17d852fed071f47d0a5495ac4b42aa1a9f5
parent6bbb5b3f138356a3422acfd882f9a3793659be08
parentef8b4e081c718b1a68a4aaf65b9b40aab97a1bf6
Merge ... '49c84354677555417bff9c94bd9bb6ada73a166c'
     and 'daf2e2e41b4cfe60e4b4b29f0e7b8ad83261bff3'