merge of '15289d23583c105b389da87ae8365bdb3b6c6452'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Jan 2007 20:11:15 +0000 (20:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Jan 2007 20:11:15 +0000 (20:11 +0000)
     and 'd1600a349f4c63ce3ea4add142fb0b742f6ed341'


Trivial merge