merge of 'd13e860cc99eb6e7165589bb5b3efcdc273ae032'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 15:06:05 +0000 (15:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 15:06:05 +0000 (15:06 +0000)
     and 'dc89094b528d67f441ec460b0a314a2ff6ccbb98'


Trivial merge