merge of '30d4ffe61f8be818a3284fcd72f5e65697855083'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 29 Jul 2007 21:02:17 +0000 (21:02 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 29 Jul 2007 21:02:17 +0000 (21:02 +0000)
     and '871de5bd63d5f7181059bcc581e6f21a7d547242'


Trivial merge