merge of 'a77bbd441d90f7bcc382233502647387947ff15c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 14:35:21 +0000 (14:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 14:35:21 +0000 (14:35 +0000)
     and 'be2bdd5c0b8ef23087e82756662dbfe583e4855e'


Trivial merge