merge of a49a202a6edf7281ee0864e523a6292173b5be55
authorAdrian Davey <ade@beth2.org>
Mon, 16 Jan 2006 16:37:50 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:37:50 +0000 (16:37 +0000)
commit6e217552944efc56513ff6bb1cc6d3218a84ca14
tree003dd8223d1886744d651c5c262a7ab8695e4202
parentc5e7f1ce2f69b90fa1511c96472e3a4453954652
parentef6d62db505bece645de1a33555e3f7146873f7a
merge of a49a202a6edf7281ee0864e523a6292173b5be55
     and ae14c4dfff4901693990f432e22da76054ac4da8