merge of '1f4f07522c89b1ab3b65e60204a55a1a00974bc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jul 2008 19:44:54 +0000 (19:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Jul 2008 19:44:54 +0000 (19:44 +0000)
     and 'a8931960546bdf36307b49ffd1b252b3f0a2b108'


Trivial merge