merge of '0a5045efa2609655b6717431c477b9d997fa9dd1'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 2 Sep 2007 17:00:38 +0000 (17:00 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 2 Sep 2007 17:00:38 +0000 (17:00 +0000)
     and '8548c765d7840651dc3e1d81df59a848a8b61fb6'


Trivial merge