merge of 'ad35118024f3b76889242bd536bd859675845efd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 15:48:29 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 15:48:29 +0000 (15:48 +0000)
     and 'f1f02c875914c0bfe542289381d12559c4843ff7'


Trivial merge