merge of '17925750cc92c103f1c1092d2fd8eefb4d3b5953'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Oct 2007 20:23:19 +0000 (20:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Oct 2007 20:23:19 +0000 (20:23 +0000)
     and '49b0a08bb947090fea922d721fe5d0c8c2cbd719'


Trivial merge