merge of 543d2c7b9a975cffb6059cf1e427f5f71ef9498e
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 22:25:05 +0000 (22:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 22:25:05 +0000 (22:25 +0000)
     and fa4d0967956da9fa067530a3796c20a1b3451489


Trivial merge