merge of '43591068998de05cfdac737237e45e3cd0260ea3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 11:38:40 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 8 Nov 2007 11:38:40 +0000 (11:38 +0000)
     and 'd1a492aecc2679b803ca6d8013a5391c4a281f9f'


Trivial merge