merge of '42bf6e48b1c776ec48b21ce58948bf1ef7ae2fed'
authorPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 21:14:49 +0000 (21:14 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 21:14:49 +0000 (21:14 +0000)
commit13bdf166cb63d57f2941da6cfbc4f0cbac59f25c
treea5deb8b3d5168f2750105e343088fb396138e6b7
parent7a12ebc94b26ba820722265bf465e7f870c3741a
parent15325e321d0ee0d1a185c756c4d58d133d2c1c27
Merge ... '42bf6e48b1c776ec48b21ce58948bf1ef7ae2fed'
     and '971150ae9b5ea5ece65d001e9966bb32966d3700'