merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 27 Aug 2008 16:22:56 +0000 (16:22 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 27 Aug 2008 16:22:56 +0000 (16:22 +0000)
commit5a60e8d2d9220e02966c8cf776b5c593831f345b
tree7169a07202027012eb5b1a77a2a91bfffefdbcb0
parentab3f80ebb0215321f9ce226ce54438492be8ab5e
parent4b0b97806315711698523175461283205eda3918
Merge ... '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
     and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'