merge of 'c49be42499a8281e021296da447021b3145791d0'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:44:36 +0000 (09:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:44:36 +0000 (09:44 +0000)
commit78283dac6429a6adaf8d76ed323030150f583eb3
tree7812e77efb9f5bd9cc4ebb49b381887627188707
parent0936b30ae6510cd0e47f2cae42025691fbb78e9e
parent5f92d8f70b873ea097153af602986ab7e8dd8399
Merge ... 'c49be42499a8281e021296da447021b3145791d0'
     and 'd1eed5f4580f0335a30026b7fe1b92390e3312dd'