merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
authorAdrian Davey <ade@beth2.org>
Mon, 16 Jan 2006 16:05:31 +0000 (16:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:05:31 +0000 (16:05 +0000)
commit5296d0212e55e49fd0afce08751c54b5057a84fa
tree502beaa92d47c0e76cf5f1b5c4cd5e42f5f74d67
parentc10a9dc08e6f05e1b7ea6cbd90476c573ba75c4a
parent04c2dc3bcf1aa6282713546208db8591e5487db8
merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
     and 36b037a423c8b35b017dc3b821094d570ea82d5a