merge of '54d43c826adc6b1f25620196f4a9115039e1900c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:48:39 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:48:39 +0000 (16:48 +0000)
     and '5f9d9345cb8ec606bf01fa3933d8377bf04c749f'


Trivial merge