merge of '3e30fd93324363fef5804864bf39efef2522563b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Feb 2008 14:07:31 +0000 (14:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Feb 2008 14:07:31 +0000 (14:07 +0000)
     and 'ae4463d55d31b1c6881f1191586007da010c79c8'


Trivial merge