merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'
authorPhil Blundell <philb@gnu.org>
Sun, 27 Jul 2008 10:46:02 +0000 (10:46 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 27 Jul 2008 10:46:02 +0000 (10:46 +0000)
commit950a8a787ebd715a4e5c27d05a797de36b6ce769
tree4888762a9ae1c854e23fce04d698474c7658dfb7
parentccf82499ebfe39b56600044ec78273fd13ba23b0
parente6febe6aab5ae538809d240034d1376b894aba46
Merge ... '0f42cd616108360d027b0381a276d5b1a3cf26fa'
     and '1be001dbcc12db3d86ea2666b2fde9a5fa4bddb6'