merge of c2094ddd8cbb045e11f78698e810cdeb3511237c
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:11:38 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:11:38 +0000 (21:11 +0000)
     and 50acc639ce5b409ac093c8ee464628c013b38b1e


Trivial merge