merge of c2094ddd8cbb045e11f78698e810cdeb3511237c
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:11:38 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:11:38 +0000 (21:11 +0000)
commit0aaff4f4186ce0a81dad184286c9d9c055505647
treea524a47326e60c9b822a5e74cc8a93692bdc9cc4
parent3ccbc62b4df338ac26cba4b8ad62ad5ed09ec1db
parent5bf510d4128ad91f1b100fc80e3f2893dc20f686
merge of c2094ddd8cbb045e11f78698e810cdeb3511237c
     and 50acc639ce5b409ac093c8ee464628c013b38b1e