merge of 6c734c3ddb93620eab20893a98b5c09f26ba239c
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 10 Jan 2006 01:17:15 +0000 (01:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 01:17:15 +0000 (01:17 +0000)
     and 87835ab55e4ec8244d79c60c5c32378d0371336b


Trivial merge