merge of '667771aae40d71d3a640333d77db8501aaa679df'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jun 2008 15:13:53 +0000 (15:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jun 2008 15:13:53 +0000 (15:13 +0000)
commit97470a03ce59301e4ddfca93af76adcc49efad4d
treeb25a1647e9b9847f15a0e491a41597ef618aeecb
parent9605a91a5f0fe0017961a9c6d8845db2d0a629b7
parent1d784637a62bed7702bba56771b051899744f0bf
Merge ... '667771aae40d71d3a640333d77db8501aaa679df'
     and '789d64c5f0950113dd422cc0a20a91d15947ad09'