merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
authorJustin Patrin <papercrane@gmail.com>
Tue, 4 Apr 2006 21:29:08 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:29:08 +0000 (21:29 +0000)
     and 655f5a13bd458949813a8bf00c6865edb43cc35b


Trivial merge