merge of 'd11de5b2fccb6699a3ba660836048f87dc676a4c'
authorPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 16:22:42 +0000 (16:22 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 16:22:42 +0000 (16:22 +0000)
     and 'ee301efdfcf7c1a68f66c22997f3d9b52647f25c'


Trivial merge