merge of '486564afb93dc07dd531c82b2f7735424a813a69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Apr 2008 19:59:01 +0000 (19:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Apr 2008 19:59:01 +0000 (19:59 +0000)
     and '894eccb0f6fd46f8c72a9457612feba217d953b6'


Trivial merge