merge of '12e21bd2f481aca9252bc00eb529548b1b0187fd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 04:28:12 +0000 (04:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 04:28:12 +0000 (04:28 +0000)
     and '5057b0d0a8cd261e84871fecfebfa818b91794ae'


Trivial merge