merge of 776e1905d2f3baf38c1533b632b4f01946bfc375
authorJustin Patrin <papercrane@gmail.com>
Sun, 7 May 2006 04:13:42 +0000 (04:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 May 2006 04:13:42 +0000 (04:13 +0000)
commitfc2b2ca15b279f5dfe997ff8cc6cd078f565a51e
treeb784b7e4750476f149b43e513b2ac9d336f81871
parent7f4df0a164bf45479f5c9aaf5fdbf76dae8e522e
parentcfb95223b25908a5bf76eb8cda3950786e3b5852
merge of 776e1905d2f3baf38c1533b632b4f01946bfc375
     and f139a1f31b4ee39ad2590b0acb8dcf142c1e8d72