merge of '69a79125da9281a2071776d84dc73c20ae8dbf97'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Sep 2007 10:25:53 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Sep 2007 10:25:53 +0000 (10:25 +0000)
commit44db427349cb05a96d204f4fa0b41503b3181fef
treef72ed0060629dd0775b0bfc9e00b357e1f45067e
parentd98b11b82503e616d61b4c4b0e4b02fa429630dd
parentf124beadbda6de28f49a26b78bcdf047ceb1a677
Merge ... '69a79125da9281a2071776d84dc73c20ae8dbf97'
     and '9290de30e8c2f0306df4a03b4cd3c484bbd8ba6b'