merge of '3f1372952a23092858708c96a555777c98913155'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:11 +0000 (19:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:11 +0000 (19:54 +0000)
commitf24ee65782773729769f24f6d69e7e423dc3b0f7
tree951a9a76a9eecfab6d9394c43bd3a83ef6971c8c
parent65f11a6585828a99357b8aa0edc50855998390b4
parentac2d3569ec4df552378dcd304021f139dbe5e698
Merge ... '3f1372952a23092858708c96a555777c98913155'
     and '5c877070afbb7851bfc57f33ee001f333b29c5c2'