merge of 29e32c2404ac0652c35da25df65b8cd7a45e5a53
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Apr 2006 22:46:23 +0000 (22:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 22:46:23 +0000 (22:46 +0000)
commitdbb35efbd5742c54c9215d7b8303a75e7e2b88e6
treef51fd34c42d76a11730540267e8a1d6afb273c4c
parent51436cc601a5a1c9a0ee2fc3095166315919dc33
parentc249c2d80d47fe2b9b0567da92d7d4ca14065ede
merge of 29e32c2404ac0652c35da25df65b8cd7a45e5a53
     and 3b17b4991e8525f70b7a59e472412f0bb1850939