merge of '8d10c91e573e5f95d7f6c9de10c44d2f781256ea'
authorPhil Blundell <philb@gnu.org>
Fri, 22 Aug 2008 07:49:18 +0000 (07:49 +0000)
committerPhil Blundell <philb@gnu.org>
Fri, 22 Aug 2008 07:49:18 +0000 (07:49 +0000)
commit75f1ddaec9822b9277f0ebe5be6992172a2e0945
tree2ca27cfe7a21dd8f3104c62096cf1af3007de6ef
parentd3318d80e7c6f902ed937916728e7bc2fb7f042e
parent13bdf166cb63d57f2941da6cfbc4f0cbac59f25c
Merge ... '8d10c91e573e5f95d7f6c9de10c44d2f781256ea'
     and 'bfe45d9f35805a1e228c2ef0444ed97398cdd923'