merge of '9de858c0d5fedfdd613ec3bafebb89c999100869'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 16:33:38 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 16:33:38 +0000 (16:33 +0000)
commit52d47eefac6f3629f38c08aba37d6753337b5207
tree134303b95c55b4a35b34627045a3c25697b0469f
parent215e05dc4bf7baf979b16d86a2e28c9b4cca3d87
parentdbdfaa6382510052e538b777485f2a06590f1605
Merge ... '9de858c0d5fedfdd613ec3bafebb89c999100869'
     and 'b8146248b63ab8beefda37316fe2917efa8817a5'