merge of '175ebb8804e22098d4acb2270345622a09cb816f'
authorPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 22:22:57 +0000 (22:22 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 22:22:57 +0000 (22:22 +0000)
     and '7509e3e8303bef27a2a18d113f7a08f6888fce33'


Trivial merge