merge of '7b45c26182039166b20c1543f34004d0c1813f26'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 23:15:55 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Aug 2008 23:15:55 +0000 (23:15 +0000)
     and '7ba9db8f507dcda17bc473abb075c872db42284d'


Trivial merge