merge of '1e74798b9d0398ad1f222430066b7d2f395d22a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jul 2007 08:37:44 +0000 (08:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jul 2007 08:37:44 +0000 (08:37 +0000)
     and '593f40ffdb7c1f5127d02f4eb4a64463c9a6ae5e'


Trivial merge