merge of 1af98528cc819da70e3ec70148b0697072cec68a
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 12 Jan 2006 22:21:23 +0000 (22:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 12 Jan 2006 22:21:23 +0000 (22:21 +0000)
commit6bb85d3aeddb8a248cbab1e57efdc221fff15082
tree686efa0b66a2e67053a139754c10c03ea874719f
parent4f542541f9f486922375d1ea299642c22c1f08b2
parent990bc95f725a7da3a74a7ea86f2ef11ba143aa1c
merge of 1af98528cc819da70e3ec70148b0697072cec68a
     and dbca6f4c143066fafe7af7445da627277276ea33