merge of '3a05a99898476f8785cfc6c4ffdab52a170cc3e0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Aug 2007 12:06:48 +0000 (12:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Aug 2007 12:06:48 +0000 (12:06 +0000)
     and '7d0e0dda1833d41fc45440f5824943ab387d0698'


Trivial merge