merge of '577e0fae5932f28f1096d2650fe9d96fe41fd58d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 14 Oct 2006 19:23:25 +0000 (19:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 14 Oct 2006 19:23:25 +0000 (19:23 +0000)
commitefdea6161ccbea20e5188524b1e2d1664475eb2e
tree15ed95b7db838c09c2b2a32eb19c55f2a9bdc69e
parent811e7d68cfa0d5d4a2e83baa406a4d47c707dc52
parentec04367f46c87d5d7046b7621ee266d5723bff26
Merge ... '577e0fae5932f28f1096d2650fe9d96fe41fd58d'
     and '84667dc56e1a3e43425da1c10dc836e3ea6e81f9'