merge of '854af845cc8e7d6a3ae568387115eb89f78fba82'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 14:29:42 +0000 (14:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 14:29:42 +0000 (14:29 +0000)
commita6f54174f6b7fa826719cf013e0bfcdbd0e67373
treea6672623e635a93582faad42ae1f0a252caa90ff
parent65f3019fc786bbf866d8c10af50a2aff3eea5bdc
parenta9c5f0bba72000c9c64b136430eb28f4eb74f154
Merge ... '854af845cc8e7d6a3ae568387115eb89f78fba82'
     and 'b580e935f43d469d6a35f9c89515741825cb9375'