merge of '2f01f26b2d9b304d4bda8793b0e7cfce2011ad45'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 6 Jan 2008 19:58:19 +0000 (19:58 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 6 Jan 2008 19:58:19 +0000 (19:58 +0000)
     and '85d4ab967941a2bea382fb9211cd65212be527a6'


Trivial merge