merge of '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Dec 2007 17:07:57 +0000 (17:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Dec 2007 17:07:57 +0000 (17:07 +0000)
commit288ecdbca2d898bc6aad1d617cee9d64a365567d
tree5ac5dab34e5c8b5f9ff6a87f2469dc04b8a1cdbb
parenta6895a618dd4bd578e8502f07e22ab059ef8bba2
parenta8a23bb8cd3ede2b44097d7145c40702f7d70a63
Merge ... '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
     and 'd025a5f00ad6ca971cacb9b19194efab7e1bee77'