merge of 'a4569078ab220c88694fa953c1dacc27d4b9300e'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:21 +0000 (16:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:21 +0000 (16:06 +0000)
commit969b90880762541f0a33f355b6426cdb1c1037b0
tree39e32856a84ad308fc7d831ba5c82035ac0c1047
parenta0adf67b586d4dc5364f88a20d80a8b126d8e689
parent4acfd704d0eb15143f1487ef728e6900dcdc460d
Merge ... 'a4569078ab220c88694fa953c1dacc27d4b9300e'
     and 'fc6211a28427a6d82895be30299c901ec3e85868'