merge of 1de0fd1842b598a87e5a45127325beb9643793a4
authorJustin Patrin <papercrane@gmail.com>
Sat, 4 Feb 2006 01:42:52 +0000 (01:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 01:42:52 +0000 (01:42 +0000)
     and aff5a7a57c5f19ed3d9fe9c0e2cee65bbadb6041


Trivial merge