merge of 12ad312536380ea2dc9169b7d73257f999484105
authorJustin Patrin <papercrane@gmail.com>
Tue, 7 Feb 2006 22:19:05 +0000 (22:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 22:19:05 +0000 (22:19 +0000)
     and 21ab572cc3967a02344791cb310b14cf5beb5d4f


Trivial merge