merge of '7a32604865cb7ad63fbc7f14acda9e02229b44b5'
authorPhil Blundell <philb@gnu.org>
Sun, 28 Jan 2007 16:14:43 +0000 (16:14 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 28 Jan 2007 16:14:43 +0000 (16:14 +0000)
     and '9ab9482d0ea26dbc9267d10e1eb42cc1a7546b6b'


Trivial merge