merge of '1c81965a2b4441230dcc780cb75b714800217cf4'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 May 2008 15:26:18 +0000 (15:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 5 May 2008 15:26:18 +0000 (15:26 +0000)
commit93efeb8f87b3d2e25f358919557367e9763c515f
treee8586f31b56a0169e5f190c159a4b09fc1533e70
parentc78224a870b742de11b8171d6b98ea4b799baf44
parent3ed247c362535ad6f9b77836b3c3d4aec261e1ca
Merge ... '1c81965a2b4441230dcc780cb75b714800217cf4'
     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'