merge of '209ccafa5a29dc4d6ec16bbb89bfd465904ce377'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Sep 2007 08:44:55 +0000 (08:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Sep 2007 08:44:55 +0000 (08:44 +0000)
     and '6e5c49eb75135e003132c12690930ce3bd10298f'


Trivial merge