merge of '3a0cedcbc0fec5fa2d459675679087748945554a'
authorPhil Blundell <philb@gnu.org>
Wed, 6 Aug 2008 16:23:06 +0000 (16:23 +0000)
committerPhil Blundell <philb@gnu.org>
Wed, 6 Aug 2008 16:23:06 +0000 (16:23 +0000)
commit50021052e0be3c00acadd7389f248e7ad96b8d73
tree685029bfb592f9b1793b1c1bf08f5118c6d6c83e
parenta1caeecbb2be20374caab2425a2c6820d012e4bc
parent81b758a90b6beff48f81c1e0c66ec699ca70aabb
Merge ... '3a0cedcbc0fec5fa2d459675679087748945554a'
     and '542045dc0960cdd026c811bc69c1db6934531925'