merge of '4dc9e841adc6770da91963ff705d5101d2ff3417'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:50:43 +0000 (19:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:50:43 +0000 (19:50 +0000)
     and 'fd1d401ab19d2e2f42e5f93edbf8609e4e3012de'


Trivial merge