merge of '3a5892676598eb5fb52e72f522d90504a9cebf45'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Nov 2007 21:51:31 +0000 (21:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Nov 2007 21:51:31 +0000 (21:51 +0000)
     and 'c35290b09c1ca880d544533f46fa7833a9ee72ce'


Trivial merge