merge of '5a00df302fa5f0bd27e8591c24d944d935e7a4e9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 11:38:30 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 11:38:30 +0000 (11:38 +0000)
     and 'a63f4a9ad21022afe5e9835d5f44018f136084e1'


Trivial merge