merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e
authorJustin Patrin <papercrane@gmail.com>
Sat, 15 Apr 2006 03:50:10 +0000 (03:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 15 Apr 2006 03:50:10 +0000 (03:50 +0000)
     and ccbffbb600e43462f6435f1404be257286d4909d


Trivial merge