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)
commit5e9d221edf100e3c54630d1214ae85840d75925c
tree2bf72fe79d6fc417f834eb92c0635f391237f3d4
parentb8c7c4f3c4a4606a69cc8e11f7bfad0b9a0dede8
parent1b7c262582d06e62563de18b0ba1e3cc08025cec
Merge ... 'd11de5b2fccb6699a3ba660836048f87dc676a4c'
     and 'ee301efdfcf7c1a68f66c22997f3d9b52647f25c'