merge of '1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 17 Dec 2006 10:52:36 +0000 (10:52 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 17 Dec 2006 10:52:36 +0000 (10:52 +0000)
     and 'af1d7cf6768b5e5205f07a7a63b6767971ccb1b7'


Trivial merge