merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
authorJustin Patrin <papercrane@gmail.com>
Wed, 18 Jan 2006 17:07:05 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 17:07:05 +0000 (17:07 +0000)
     and 72f8be28da1900bbf98ed7cc1fa244d3cd750692


Trivial merge