merge of '3529a2865fbdc0ef7cb334207e244f70290fa94e'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Sep 2006 20:45:54 +0000 (20:45 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Sep 2006 20:45:54 +0000 (20:45 +0000)
     and 'bb69f40c7003f1a8d720886f7c16a042a4369916'


Trivial merge