merge of '5ffe474ec8d4aacce010a309c84060d66754822d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 May 2007 12:23:08 +0000 (12:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 May 2007 12:23:08 +0000 (12:23 +0000)
     and '89d494bfa41c385b66a8531e7af580bc43ed3e15'


Trivial merge