merge of 7bae67cd8daef4d5a9307341c2352670e31ca3b5
authorJustin Patrin <papercrane@gmail.com>
Sat, 21 Jan 2006 00:20:28 +0000 (00:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 00:20:28 +0000 (00:20 +0000)
commit72a69325e8f9989ad0efc7b42f232e2f7baa6e6b
treec527bbdaa037d85f13db990780d5a38a30c1790b
parentab3a0aeab9d7530d182c83d631b4443d9105a028
parent94ddcd45829ee137307b10b222dd1d32cd26916c
merge of 7bae67cd8daef4d5a9307341c2352670e31ca3b5
     and afe451e4a4ab3d7a152374af3d545c3f4002a864