merge of '2f187f3aefd5783137489ac83567e80296d3e37b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 14:05:51 +0000 (14:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 14:05:51 +0000 (14:05 +0000)
     and '9ace05afbe48689414ba40971c10e189a2234247'


Trivial merge