merge of '6bcbba52935837d8cc6bbd2b56f5836157870682'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:16:26 +0000 (00:16 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:16:26 +0000 (00:16 +0000)
     and 'f83b56f2c6061d5f1487eab87b4530480d6bb88e'


Trivial merge