merge of 398443d538482a6003cb29221382acd4afbde19e
authorCliff Brake <cbrake@bec-systems.com>
Tue, 16 May 2006 10:52:40 +0000 (10:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:52:40 +0000 (10:52 +0000)
     and 6cf43463f8980c4949a1dea852d710d362f18ac8


Trivial merge