merge of 0967efd07b22c9bc660b86824d4c3a888f0d9e4a
authorJustin Patrin <papercrane@gmail.com>
Tue, 18 Oct 2005 21:28:46 +0000 (21:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Oct 2005 21:28:46 +0000 (21:28 +0000)
     and 7b483e2e04e0fbbaf5a7d86cc57455420540e5fa


Trivial merge