merge of '7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 21:48:09 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 21:48:09 +0000 (21:48 +0000)
     and '9a0caec6fe48a6524346d27828894085bf73636d'


Trivial merge