merge of 85a1c1efe7466253130cd2e2a63079154ba54454
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Apr 2006 09:27:59 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 09:27:59 +0000 (09:27 +0000)
     and c67d38b84a548cc9efa81f9371658f5c59e87e43


Trivial merge