merge of 7054d97385e70d2dc2f6a27205d99719a22abd1c
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 9 May 2006 21:24:52 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 21:24:52 +0000 (21:24 +0000)
     and 7c2d7eb22952d356dfeb22359c91decfa90ab117


Trivial merge