merge of '937e098c88f41af274b6cb04f049439e168d15b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Jan 2008 14:46:13 +0000 (14:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 Jan 2008 14:46:13 +0000 (14:46 +0000)
commitb7031362eafd33ad5c421b07f2bc4f37e4f8a829
tree5e2a2fe4f2c4f4c29ba0db105309e2c792f2e4ba
parent898c5fa4f1a22a909b898dd018b1d19e8f7b3db4
parent1cc3b20815d17dc80799a148edbdd58dbfded439
Merge ... '937e098c88f41af274b6cb04f049439e168d15b9'
     and 'e4319c22e09affdcdc5fbec3afd685b355fb8e14'