merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
authorJustin Patrin <papercrane@gmail.com>
Thu, 25 Aug 2005 17:21:51 +0000 (17:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 17:21:51 +0000 (17:21 +0000)
commit1eb9a965791e8a7524b3d317365e0f85260cd6ae
tree4386fcd45626394f7ffa14578c09843c213190fb
parentf06e59a89c4c80c714f083e8246e0fc8c15c0776
parent6cf3b9bc13b5453c1710651bae6afed4846c9972
merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
     and 509d6e16b96b95f3eee23c9d533dd87c708b8d4a