merge of 1e5ed75da89ccfd9e2b84471e321a4ef7aea7f14
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 27 Sep 2005 21:25:42 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Sep 2005 21:25:42 +0000 (21:25 +0000)
     and 6c4836f3c8b3446186ac9adbcf4d2dc5c9211f0b


Trivial merge