merge of c8607c1fd6f2272b8b57d41db45cc4ee916f9fed
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Nov 2005 16:03:24 +0000 (16:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Nov 2005 16:03:24 +0000 (16:03 +0000)
commit2b6507f864f059a87049fd41ee3ddb4eeda5e01d
treea824785ac0c1906c05d4976c72fe3fd6fa6205d4
parent67e02356abe26ec5c8fd4cf5b183a52f2631092e
parent828a00a6508ced61f02bde7a527052d1f38a2aff
merge of c8607c1fd6f2272b8b57d41db45cc4ee916f9fed
     and f7da4369dc264ba4cc88a416a2763402bf92d133