merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:00:18 +0000 (10:00 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:00:18 +0000 (10:00 +0000)
commit8beb70740dbd64d2138df8a07aafc24719cb50a6
treeb9afae298a6bcb79696984da4422d5ef939a4031
parentd2bbf4ace892d7f32933ca26f1f2b320fc0bcb99
parente25bfd9221d17ae8fe0efdc96ed9cd74de0e4a4d
Merge ... '576d7c6e5dbff47f56003806561fdc43a07c6f50'
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'