merge of '958bac4da4de63f8fadb3d84361a07eee1bd3246'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 25 Aug 2007 23:52:48 +0000 (23:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 25 Aug 2007 23:52:48 +0000 (23:52 +0000)
commit4a37d232cb35608026da46499ba8524fc41e9470
treed0d2d0101b3ff61f8bb1400af0c25bdf064ef3cd
parentfb43a3e9bc8373f13b3f86d4740581b2df1b5fc6
parent4d7b28b363a91078f987a1294f28308c6c77b12c
Merge ... '958bac4da4de63f8fadb3d84361a07eee1bd3246'
     and 'f4021a8051081d380813f73eed127182fda51b45'