merge of '6114e88c0acc202895c41c560c0546244d2c5227'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Nov 2007 19:41:52 +0000 (19:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Nov 2007 19:41:52 +0000 (19:41 +0000)
     and 'c971ec89c74107b683a418e2b491026999418bc4'


Trivial merge