merge of 3f5dd0e7c459f413d83327c79e33c0301319dfa7
authorRod Whitby <rod@whitby.id.au>
Sat, 21 Jan 2006 01:00:54 +0000 (01:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 01:00:54 +0000 (01:00 +0000)
     and b40740dd28cbde949223caa99ba81c79cbcae4c0


Trivial merge