merge of '02a02b10517e99b436e2b65592aa837804903373'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 15:48:29 +0000 (15:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 15:48:29 +0000 (15:48 +0000)
commitd1bb9010a1a392c83aac684b08913088adcd181d
tree162e277a0cf58c12d257e8d830eabd8068d40fcd
parenta7f942852013cc0de385e650ce217f810999c4b5
parente3c68ca5b35a68ba64500e89b141b360b3dc6bba
Merge ... '02a02b10517e99b436e2b65592aa837804903373'
     and '03fd68a93fd9cdf820919cce44a380cbf9b9e9b5'