merge of '5386fdf357959b2fd3a16c6466b1dff24ef4e3c2'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 26 Sep 2006 08:09:36 +0000 (08:09 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 26 Sep 2006 08:09:36 +0000 (08:09 +0000)
     and 'cd0ccc8a6e40034b4792530a3f601f46a163e6cb'


Trivial merge