merge of '3289b5a802bb36f84f72d159c65ca3869e90041e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 21 Aug 2007 15:18:13 +0000 (15:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 21 Aug 2007 15:18:13 +0000 (15:18 +0000)
commit518eaefe12d6df0580699ce600a709adac1e15d9
tree632077c537106708c304c510f0cb3b6786d79e51
parentd620ef81b02640cd5ae2502f6517f83729a3723d
parent5152cd3c9348eb5c748ff135b5afff55ef08dee5
Merge ... '3289b5a802bb36f84f72d159c65ca3869e90041e'
     and '5ee4afc833aaf754d4605b6c97860c3016037b3e'