merge of '88dd6a801655485b76bb6d591c1f763d51ff47b8'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:47:15 +0000 (11:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:47:15 +0000 (11:47 +0000)
commitf1d0d79f48ab191a1ed0b5065e39046e1d95fef4
tree860036a8554d604726a256d7408c711df834b7cb
parent2534c12ac4c879178132751e51db09c6e4f22cf9
parent958b8822656bed6e5526f9441fea36570787f9c7
Merge ... '88dd6a801655485b76bb6d591c1f763d51ff47b8'
     and 'ea2a23cae4f4d939a07f699c39b603c4c2559ad1'