merge of 'd734e1412138fc4107a768d25359b9c89f869193'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:35:14 +0000 (13:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:35:14 +0000 (13:35 +0000)
     and 'eb6f56b3844fedf18386caec8d2691373a243c26'


Trivial merge