merge of '3591fc910e3a0cb992f268a37048f34b281193d4'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 15:45:29 +0000 (15:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 15:45:29 +0000 (15:45 +0000)
commita1ec3427b26144198af6d3ca2adc97e9fcfcc0d8
treefbc09af116e8efe3117460be430d7cb3e2295193
parentd0e7f9ac914326aa09a76ff96f0d90ca17b54031
parentd408f3838dc972908146322f0d9fb85b647b9aa9
Merge ... '3591fc910e3a0cb992f268a37048f34b281193d4'
     and 'd30004f9fb76dfedd49611572e8a2fa9a9c043ee'