merge of 7407af57a0190a57119bdc083f162292bfc7e411
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 20:40:50 +0000 (20:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 20:40:50 +0000 (20:40 +0000)
commit602f6ce52feb179a83a945b7f2dc82736e92d922
tree473e4f7f25f31c7b5f39993e3108f49c101c60ec
parent5cb8c8eb102bd6a3194ff5eb0cc00a855cd98573
parent78891418744ab7ba7738c8aec0dc9a20e8bc2220
merge of 7407af57a0190a57119bdc083f162292bfc7e411
     and c032f363b900b2e705a80a784c2bd7eb7c7d6549