merge of '00387596010fb456e9ddb8c5fc00779ab58ef9b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 21:53:14 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Jan 2007 21:53:14 +0000 (21:53 +0000)
commit1e0103a659358ac90851fb867e323147e1dfab82
treecd3598312aad779d918f1a4638a357cead7404ac
parent73aaf56204cd4ebdabc4528d86ad1128534248b3
parentbed4011543c11c255d4e2ff5219bdf5acd2c1f6b
Merge ... '00387596010fb456e9ddb8c5fc00779ab58ef9b2'
     and '603695e69a919842f2105d9fe3ad853c1f0ea386'