merge of '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 16:17:07 +0000 (16:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 16:17:07 +0000 (16:17 +0000)
commit2f9790385d297a571379a3099d44032ac4d5cf1f
treebba797c705e1267b813b180f2ebd031e26b1041f
parent349e10e0cde31cc5dea6165c87591f18a71198e8
parentcb4f4c74d2ef2463084cb8deff71c461475f2c43
Merge ... '3bb98c788d34c3b10dae4f9f635695a0e8da61fc'
     and '43c8d115f4121fbba5fab40e9d00365636b9fb62'