merge of 'c231987751696ab580afb27261789a5becb2c0bd'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 23:50:02 +0000 (23:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 23:50:02 +0000 (23:50 +0000)
commit7abdb3be188a3586a0687afe185041336c2f0dca
tree5e3e804e863d73ded0328a8cd595a3a6438f4c3a
parente92bb6935887d45b0dd13ffbd7070d403042892a
parent5b413a13d9d7c28ffb517f6d3d60d5fc1b6cd74c
Merge ... 'c231987751696ab580afb27261789a5becb2c0bd'
     and 'c3f0afcb1172d319278bd0ef4ba8c811cab4ada2'