merge of '474680366447a4dab2f989364e5d93df82ff5054'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Aug 2008 12:11:45 +0000 (12:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Aug 2008 12:11:45 +0000 (12:11 +0000)
     and 'e823514ff8e0cdded7f451b2e7602dea0a0a9fc7'


Trivial merge