merge of 3da3c8510f28cecce26d43c429a795ef96d73c91
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 19:16:15 +0000 (19:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 19:16:15 +0000 (19:16 +0000)
     and 7b0b984392478c157095acc3ffa870911991d32a


Trivial merge