merge of '6882e7778ca3177ffae3e35d426bb9f2a6b3ab9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Sep 2008 01:53:37 +0000 (01:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Sep 2008 01:53:37 +0000 (01:53 +0000)
     and 'c07f5c2e4c25e6b3d2a46e06ac9b6aee412395a1'


Trivial merge