merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 11:33:15 +0000 (11:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 11:33:15 +0000 (11:33 +0000)
     and 'a1dfdac15b4a615ff22cad20ebbf724bcf12fa04'


Trivial merge