merge of '5a505039c2ab39aac1ef64bce007b50966455de6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 22:09:07 +0000 (22:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 22:09:07 +0000 (22:09 +0000)
     and '8d5cab38d57a71302b83b51e588b7f781dfb1c41'


Trivial merge