merge of '00ab42cecad6f3cff7e430dfe1e456ffab6ee08c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:25:21 +0000 (12:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:25:21 +0000 (12:25 +0000)
     and '886f590eaf51aa5f80dff32c73a8d713ce989b3c'


Trivial merge