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)
commit25fd37ef987368dd32eba359273c5af98158a364
tree5f2320dd99ebfb6fd219bd57a9395ebddeee6537
parentb099d3ec077475cf9e24c271fdbd4c1ddbbb70b1
parent6baa6c1f96b3137abdaf5d50af955115844197ae
Merge ... '7a32604865cb7ad63fbc7f14acda9e02229b44b5'
     and '9ab9482d0ea26dbc9267d10e1eb42cc1a7546b6b'