merge of '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:13:36 +0000 (11:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:13:36 +0000 (11:13 +0000)
commit63b6a95c46ecabc46ad5ac81ea8ff72897731e82
treecb5ea08ccc2f34006f1d0adcf8cd3fa537dd19ce
parentac08cb0167f930b10506cb85a55b85602ef79c95
parent027e69437efaa0d4740136e5f3b1be554e5998a8
Merge ... '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
     and '61fa8bae987fbc94312beed01805ad1e118a1638'