merge of '2bfc7617553093cf49cd0c4c7e294436a43b2bee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 13:04:11 +0000 (13:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 13:04:11 +0000 (13:04 +0000)
commitc99886f6d3558e40c72f447d8ae36303f7ee1d4a
tree7fcb21727f42e59506841330c094ef9ec2a3df16
parent886be55158efa7796afb0aa0ff60d2085222033f
parentf7c75576bf5aa322dd9902e6950d9fcad22782a0
Merge ... '2bfc7617553093cf49cd0c4c7e294436a43b2bee'
     and '5cf78fdb2dc10cb020c2a329af096264e3c0f224'