merge of '559b63acfed0420f839e535ffad26766df66437a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:43 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:43 +0000 (12:07 +0000)
commit785baaa2d0432f753010778a51b7914618af9989
treed7661effcea1008b3aef9513118dc9da2b2d8e21
parent40d4d8f4d9ab5771b2e9dff13b7150e9968e14c2
parentf77305366a560bd673633ee926ab20bfb3eceb91
Merge ... '559b63acfed0420f839e535ffad26766df66437a'
     and 'c8122b4f0e7a0350bf0208abe44a4d7fd4c8828b'