merge of '641a15c42908d49a2d22b32302275bdcee06d601'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 07:52:48 +0000 (07:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 07:52:48 +0000 (07:52 +0000)
commit0f4e03158ddc147fe194b47f0f0da10076cdab48
treef2ab39afe60285ed37922f54aa3c9762d7c52e55
parentff44a61a9b672aab9b86c2870b6972fbb040440b
parent74a560bfe000c60dedd513604cea372dbac6590a
Merge ... '641a15c42908d49a2d22b32302275bdcee06d601'
     and 'bcdca45c1b2872acd0f00daa6d38395d0d5867d1'