merge of '0c08620c82f3631ac19e82f411d1eb63f02fd4f5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 13:40:41 +0000 (13:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 13:40:41 +0000 (13:40 +0000)
     and 'af497374bb680be4e77a17c0fe994be8572e3004'


Trivial merge