merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 04:42:19 +0000 (04:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 04:42:19 +0000 (04:42 +0000)
     and '9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b'


Trivial merge