merge of '24b8202a233fbef98ec2f7f85d4702688c1b951d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 00:40:44 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 00:40:44 +0000 (00:40 +0000)
commita31d1fd4a686ad35a7b5c543eea00652ffb3e705
treea3dfe55523c669aa21fc6d9d8e0ba8048d3e52ce
parentb002edacc2f03e79ced9222d2d162fdd5842d3ff
parent0237c31ae0ea01dc9235c0a1400860f3350d1181
Merge ... '24b8202a233fbef98ec2f7f85d4702688c1b951d'
     and '2ebd940d98ad52f4e6d4972f53b6a358d0e845c5'