merge of 63781da032c43575221c98947e7475e3cb577eba
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Dec 2005 20:00:53 +0000 (20:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Dec 2005 20:00:53 +0000 (20:00 +0000)
     and d638a96a479477de2f205d32492408da8c183085


Trivial merge