merge of 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:57:09 +0000 (18:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 18:57:09 +0000 (18:57 +0000)
commit059aa9ee0f4c615cc587d708ae2aeba56fd7116f
tree0ba39eef756ee477e6bc200b0523aa41d43baaa5
parentd157d168cebd735347bef6a4f921565cdadd17d7
parentf7c09d6ae335fa891b1a2e47a0715596f2a06472
Merge ... 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
     and 'ba129bd9e38e74717e81d25413881c72841b72fc'