merge of 83e8fa36e700a05b7fa4788c83380a4bf023e8f1
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 25 Oct 2005 20:49:27 +0000 (20:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Oct 2005 20:49:27 +0000 (20:49 +0000)
     and f4799c6524a23c38df298781ba56839163a0ea50


Trivial merge