merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:12:54 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:12:54 +0000 (21:12 +0000)
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46


Trivial merge