merge of 18dd8cf21b475b0438065a81c795a331d4dd1076
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:11:03 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:11:03 +0000 (21:11 +0000)
     and 4a2edc2b9931c29b07ce96536e36250048aa6e97


Trivial merge