merge of '5a21ce3f8925a2f59922f56157e689a0b3da0ae7'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 21:55:44 +0000 (21:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 21:55:44 +0000 (21:55 +0000)
commitf13b1a3dcbcfbc9c696051920e51425ed44b269c
treeec59732b964b4dafcab98ce8ca7e941f947e6ea9
parentf6df43ad54171f885cbf106f8dfa53ad5b4342f6
parentaddb59beb41d79cf8d2ce0abceda619522d80959
Merge ... '5a21ce3f8925a2f59922f56157e689a0b3da0ae7'
     and '5bb4bd3c22bd1d7fbf5eb23c0423846435ca5e06'