merge of '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 04:11:30 +0000 (04:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 04:11:30 +0000 (04:11 +0000)
commitfc10c989c666c95bb7ea41bc24bd14c396625286
treee2581e3d3daa495ceb7e811171e2fd4e9eff333f
parente3a8f3cae69897452d0d1f98b3130060ab81a497
parentdc7fec62f475555fbeeec6448a4fd936f9c442d0
Merge ... '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
     and 'b1be59f70fc52177a67b15d29fc93897c548b5a8'