merge of '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:01:56 +0000 (12:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:01:56 +0000 (12:01 +0000)
commitfb42c31e81c2d2a21272a0cef6dd92c0664c7cfc
tree851ad05cf6e6cf778cb9555a6d1aae355cd0e4c2
parent70d0879a2267b4f02025ff0f323c3659fa81d68d
parentf803172b1bfc33ca076f1a8a8b03f753fd0f95c4
Merge ... '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
     and 'e657326eb8ba936ca64ffbedee6d6415a1ac4ac5'