merge of '1ac2e0e784cd41f10bc1873b42ca201381b538e4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Sep 2008 09:27:41 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Sep 2008 09:27:41 +0000 (09:27 +0000)
     and '72a3a26c741dda13cbbf305c4d6a9abad735fd85'


Trivial merge