merge of 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 14:21:33 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 14:21:33 +0000 (14:21 +0000)
     and 'e55bf39595a78df12d17e4b80e9ed474ad5a467d'


Trivial merge