merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf
authorJustin Patrin <papercrane@gmail.com>
Sat, 13 Aug 2005 00:54:35 +0000 (00:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 00:54:35 +0000 (00:54 +0000)
     and d34b6f078abca855ff8e570f35e7de8c121eebd0


Trivial merge