merge of 0693fb46494db1408733d460818b696a6d089cc6
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Dec 2005 13:16:46 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Dec 2005 13:16:46 +0000 (13:16 +0000)
     and 635857df6c3fb5ea52e288d7b847d28c28cbbdf7


Trivial merge