merge of '190a8b90f7e29caa18792605c4349ba124edb99b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Apr 2008 11:36:30 +0000 (11:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Apr 2008 11:36:30 +0000 (11:36 +0000)
     and 'a892df1bf828480c126e8e1a9ea6202a7c8e2e88'


Trivial merge