merge of '9d4e924b0bb41a7ab01cbbbd984916dc4367895c'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:31 +0000 (16:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Dec 2007 16:06:31 +0000 (16:06 +0000)
     and 'e2bf9fb2e2837fb9aa6c231fa227d473844d1f88'


Trivial merge