merge of '8a9ab618f4fb563bfa088670c3dfd8b3c465c622'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Aug 2007 17:45:57 +0000 (17:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Aug 2007 17:45:57 +0000 (17:45 +0000)
     and 'b991b244c6299cb77c276a89cd7f5bd08da52250'


Trivial merge