merge of '288800330cbc2faa2cdc0823b0016b858b6bee68'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 16:23:55 +0000 (16:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 16:23:55 +0000 (16:23 +0000)
commitc1c3aa4892bfe913d837781b4078a0f63def42b4
tree402d5c7ebfe4e46b03e1afa49944f6e932d08151
parent6f3bf92b602a4229723e1b4e2d09b6291ea16d29
parentf6a7abab3c605662c0a39a65e0dfbd50dbda450b
Merge ... '288800330cbc2faa2cdc0823b0016b858b6bee68'
     and '6fbaa4dcc3640605ad76e93bbea2d08d823badbb'