merge of '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 11:30:09 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 11:30:09 +0000 (11:30 +0000)
commitd5a76b0ccd1dee2133e8c69d770f1b3c3c770ebd
treefab1ae9e88de6432617e4eb06b99bb84c4ef89c1
parent0d2076ed8e2a9566573bc16db2ada8a01fa1db29
parent9043f995bef80e7000e28d4ec628abe2d364ff06
Merge ... '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
     and 'b14d208c68db08fe1a8827e66c5551d6e362146b'