merge of '8f22e308a4f1e472b6ee43eeed9d095c75c88fa2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Dec 2007 21:33:30 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Dec 2007 21:33:30 +0000 (21:33 +0000)
     and 'dcd43331e77a5ffe94fa8288214499b163cb6021'


Trivial merge