merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:31 +0000 (11:26 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:31 +0000 (11:26 +0000)
commit1b4b3060fb466e34ca2f6b11be8b24c5d4fc718c
treed175e77dc0feb59b8a35175dd33ab04253f7c554
parent403d83e9cd508a0f290f0647163e3745fa91fd27
parentd9bec7fce7e68c7d277276185cea9bfb50e7af1c
Merge ... '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
     and '8c692ec4078a7d2e345213289da925bfca3cac63'