merge of '1fc3f2af2bc1ab6996667fc87696b79af25ad493'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 16:37:56 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 16:37:56 +0000 (16:37 +0000)
     and '7227e7b465491a16d241c26424306e622bb8da05'


Trivial merge