merge of 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 21:13:33 +0000 (21:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 21:13:33 +0000 (21:13 +0000)
commit3e2b290abea4b8795433fd8753cd15bdea04c10c
tree0877ec79d504cb85d8df07ac92fe3f2a2949b6d8
parentf4cfe8c0ebc9ae2af5416b608179feae63e2e5bc
parent1c30b9017d9e002ec685993b939c102494a66778
Merge ... 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'
     and 'd969b9d6bcaf1b8db0c0e85d4ce95524a579055b'