merge of '1e7e45502df6c52d725444e6655b368305ffe8d6'
authorPhil Blundell <philb@gnu.org>
Sun, 3 Aug 2008 11:14:32 +0000 (11:14 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 3 Aug 2008 11:14:32 +0000 (11:14 +0000)
commitd0fcd141d88e40de07c6539f7735f4983a1eea5f
tree66c22e2841b10d029b8aa0963757ce4cc87d5086
parent1f8d487013dc39ac1dc56e1f8b1b7d3b88dc8ad6
parent7b11f73200b750c2ea8c1db2543d3c3ec0d4c5d8
Merge ... '1e7e45502df6c52d725444e6655b368305ffe8d6'
     and '6690ff49b103de5f60ddc09faaed43726adb4506'