merge of '623fafc1c9ff4db42529f744cc912543a470ddf9'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:56:04 +0000 (15:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:56:04 +0000 (15:56 +0000)
commit6c05c351079529c499c8c29121f6d4ec5ca76933
treeee972290e8523d7e0c02b01d09644d04b83ab30d
parentd46d07f9d1781f0dc27dd50c8a76ef2428039d92
parenta22c25bf6ae9a401687a0fad1e9e84221825c75f
Merge ... '623fafc1c9ff4db42529f744cc912543a470ddf9'
     and 'ebeb227101b1899f5c93f0de60933eaaeb3ac6e1'