merge of '7e6adf2eba691057299d67aeff9562e39132c566'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 12:14:34 +0000 (12:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 6 Jul 2007 12:14:34 +0000 (12:14 +0000)
commitbf271f2bb42d5477b3cc0d8d0f93be45bb989ba8
tree2a19fc7f30db88e07aa815e6cdb0d3415fb0e1e0
parent94cc5bbfecb6390e8b342ce89a532e05ed40e69f
parentb55eebbd8cb2e9a1c739f8fa8b220e437a3665e6
Merge ... '7e6adf2eba691057299d67aeff9562e39132c566'
     and '87a802e7da1ecadc7269191d43d5c0434062ef8d'