merge of 36b037a423c8b35b017dc3b821094d570ea82d5a
authorGraeme Gregory <dp@xora.org.uk>
Mon, 16 Jan 2006 16:17:25 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:17:25 +0000 (16:17 +0000)
commitf42a176f495c794db2958d008ca3016f96e16963
treec0f12dc1ea6bbbf8cb50596062d530ffa053171a
parentc10a9dc08e6f05e1b7ea6cbd90476c573ba75c4a
parentc34ac47c79eb61fe4cdb203817927fc426c94bbb
merge of 36b037a423c8b35b017dc3b821094d570ea82d5a
     and fa2f4d331a36d371e62aa55ceccfe3ec1383bf08