merge of 'e9758ef5cc8f5e67a47f0490c6a6040a07926c75'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 13:58:30 +0000 (13:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 13:58:30 +0000 (13:58 +0000)
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'


Trivial merge