merge of '7d2d2c64f0573cfcecdcba9a80bee0899c24b371'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:40 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:40 +0000 (14:02 +0000)
     and 'aad166147796a0cf7be319e6fa3878b8cffc981e'


Trivial merge