merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f
authorJustin Patrin <papercrane@gmail.com>
Sat, 11 Feb 2006 21:33:12 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Feb 2006 21:33:12 +0000 (21:33 +0000)
     and ab5c1cdb1ec2745a8a648c55a1738863c84ce2a6


Trivial merge