merge of '5529fcc6533f38f6369900c99f864fda054a188d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 11:53:09 +0000 (11:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 11:53:09 +0000 (11:53 +0000)
     and 'ff0f00669a09b72c8939fb218f04c9f83bef3297'


Trivial merge