merge of '1c6f6c20e33c23b718478f231d96591d2f567483'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 13:01:15 +0000 (13:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 13:01:15 +0000 (13:01 +0000)
commit3b9a91139a1cc962e1b2801c9b900a9999f86841
tree7eb066ba5044d75c78bf2b1bbd3d0be7a8ab7a9d
parent3730169b8a1cbed89d5030cb56a7b912d75781ba
parent5ae7e3eaad3b15176a7f8d5076d4764e9280db96
Merge ... '1c6f6c20e33c23b718478f231d96591d2f567483'
     and '7b1dd96801f47207bea137bdc1cda343863a75ce'