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)
commit936f218c36509a98d9d587a7918f2a33d1441d91
tree9734ba29bc35b88181316a4535197c3121364d99
parent408fb34b733a87d181f2b2ef148b8fe61c8434a8
parent7569440e6587054a298f1417447750a3aff0afd9
Merge ... 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
     and 'e55bf39595a78df12d17e4b80e9ed474ad5a467d'