merge of 0b0c66f0bd98363eff174839d98a20f34bc0e832
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 09:00:39 +0000 (09:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 09:00:39 +0000 (09:00 +0000)
     and c98db1adfa0a8714be1a5b9b7d8e8d86530e84de


Trivial merge