merge of 'c3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Jul 2008 20:21:55 +0000 (20:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Jul 2008 20:21:55 +0000 (20:21 +0000)
     and 'd07d8aef4aa26afe6c43c94383a0a14d31ed5c54'


Trivial merge