merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 21:16:52 +0000 (21:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:16:52 +0000 (21:16 +0000)
commit90a1a74ec22b1b1c6a29ab14b8fb37334939be59
treed32cdbc1cb69163d72e0f51498a2739bb48ca661
parentcfaff848a572c4b1ca86857fef49f2b73823836d
parent19683614e9e4f259a2a17fbf515f001a36a7ad53
merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46