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)
     and 'fc6211a28427a6d82895be30299c901ec3e85868'


Trivial merge