merge of '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 Nov 2007 13:55:30 +0000 (13:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 Nov 2007 13:55:30 +0000 (13:55 +0000)
commit12bbfc94ec84e9b899d7d519aaf1181ef2590183
tree5f9fd2ae66b78e0da7df85ddfb3dd7f32fa90900
parent47f13f72c7e79cfda0e18de7d619ce870d64bca6
parentf42df529c2fc28845a7f63458d79279e86a127cb
Merge ... '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
     and '7f5c53f2fa166aff72aba4062607f641a2050e32'