merge of 'a796b081d8845fac70a8842df854fc7d82eb0b27'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:58:57 +0000 (12:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:58:57 +0000 (12:58 +0000)
     and 'eb6012f4f544cad5eba77acb92e2eafbff01a119'


Trivial merge