merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:12:54 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:12:54 +0000 (21:12 +0000)
commitdcbbfc041e59a98c9d88f4972230c4610af7a96b
tree1523259d4c753f6b4cf639d69f871edb8545e1fd
parent0aaff4f4186ce0a81dad184286c9d9c055505647
parentcfaff848a572c4b1ca86857fef49f2b73823836d
merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46