merge of '5d8c39ff16936c56ad5426172b300fff2de24c42'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 21:28:54 +0000 (21:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 21:28:54 +0000 (21:28 +0000)
     and '86618f966282489d43b51fbf0ee93b954ac615ae'


Trivial merge