merge of '4f67bea2562b34f365d7ca6807e88dc68459418f'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 23:24:57 +0000 (23:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 23:24:57 +0000 (23:24 +0000)
commit18467e7fecc84b830d131d000d24335d9b2212b4
tree356dc08528fc1c4e015c84577437213190da1937
parent6cf33c5a7e270f8df619611dd1f0f2ab8d5f595b
parentb47ad597951b6b5948795fbd86e7a3942ddc2b78
Merge ... '4f67bea2562b34f365d7ca6807e88dc68459418f'
     and 'd7f98d5dc21d49fa11962464baefb4ec32e5b204'