merge of 'a40922ce4042605b9461895764c10eef9b4b88fb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 13:21:13 +0000 (13:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 13:21:13 +0000 (13:21 +0000)
     and 'de3231b226eb18eb878a1582e969819c53434e6c'


Trivial merge