merge of a7533fe1dde530db43cb0e31307632437139f2af
authorJustin Patrin <papercrane@gmail.com>
Tue, 4 Apr 2006 17:37:36 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 17:37:36 +0000 (17:37 +0000)
     and d48f265f263a5f969f2abfd913a09b91a51a701f


Trivial merge