merge of '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:46 +0000 (19:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:46 +0000 (19:39 +0000)
commitffdc33ee9f98213b0206cbbd8496ec3b48ae1c8f
treeb83355fd177bb16b3309ba991b02d2815c42d7c1
parent4f7b18b2325b460f224f13ad1f562ee4489e9e56
parent1afd7b0bd9371f8bb52f7f63edcbca4e4e2af998
Merge ... '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
     and '887e1a4016c96ca69eca2047591511a955459515'