merge of 7740b6ed65b5143742452d7e176244424dd90f02
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 4 Feb 2006 16:21:52 +0000 (16:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 16:21:52 +0000 (16:21 +0000)
     and 8b63d51862e914db45c25ecc48e39ba5d90699e8


Trivial merge