merge of 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Dec 2007 16:35:55 +0000 (16:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Dec 2007 16:35:55 +0000 (16:35 +0000)
commit1e473cd506c0e1c9e9903794d33b669b3a2848e6
treef5f6b6a356445dda4eef12ad386f1825f1b78d89
parentae6f2adfc12c8ec00cf1cd644f87c8c4ca107e5a
parentc5698bd7ebb4642bd00676faa48a9226b7a08d94
Merge ... 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'
     and 'dee5d8b7b54d72358d0edb5fc940ae498a6b4939'