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)
     and 'dee5d8b7b54d72358d0edb5fc940ae498a6b4939'


Trivial merge