merge of '266509b97479fd932511cb63332861a369849008'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 13:24:13 +0000 (13:24 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 13:24:13 +0000 (13:24 +0000)
     and '794e1f022e3fc8866fcadb5c7158d8521fc62a1c'


Trivial merge