merge of '80e71d36ec321be9cd506e086c7f71856a768989'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:44:25 +0000 (10:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:44:25 +0000 (10:44 +0000)
     and 'ab0d9a488e49d9ec307f6d034845a25a157b066b'


Trivial merge