merge of '73d0f834a1f30cd2998b071506e97af8d849f977'
authorPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:49:26 +0000 (09:49 +0000)
committerPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:49:26 +0000 (09:49 +0000)
commit6acce0eb39f2f7cf47dc01282151a8e9fe7ddb05
treed26f5eb887334f689d5dff2e45a1ac7886f5cd62
parent78f0bd528fc92d169cc6de15e976a5e03275123d
parentce8e801d9b95f70dbffff6e8d7de4df67478ff29
Merge ... '73d0f834a1f30cd2998b071506e97af8d849f977'
     and 'a011f99d8663ce45f2473866131d2b49f5701ed5'