merge of '6784a6b701f00708668a4025f803a9342e7ccbdf'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 03:43:21 +0000 (03:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 03:43:21 +0000 (03:43 +0000)
commit5ee4cd92f338ea11167845c50debc6b4c7e451f9
tree7592c6527ec52c2ea8d7c619fa5dbfafe2b53bdc
parenteb5da6ac735a36d88b82740ececfe685dceb9bba
parentc557c0fa98fc000c0fec2a3db8bd13378705eac0
Merge ... '6784a6b701f00708668a4025f803a9342e7ccbdf'
     and 'a1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8'