merge of 3e349431fd26f1c3eb3f6a3425f8c8d44167a5cb
authorRod Whitby <rod@whitby.id.au>
Sat, 21 Jan 2006 10:00:10 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 10:00:10 +0000 (10:00 +0000)
commit8c5e1feb8f9487429eb45884b2660ad860e8f67c
tree157e6c00a3c3055e357ac5782408a2b68ea3dfb4
parent4ac1a07fcbd2a82ee7504a6423d42e6055a95d99
parent1d962951b1dded1141c5d8a1a6d7e495f18260d0
merge of 3e349431fd26f1c3eb3f6a3425f8c8d44167a5cb
     and c1cd7b6a9ca9efdbea812fd0574ecb2bcdc1f8e4