merge of '16d5c273533926e5a6b915d652e1d39e0ec61c10'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:57:55 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:57:55 +0000 (12:57 +0000)
     and 'c4cca98d5a0327e7baca40483e3a196a8f60af95'


Trivial merge