merge of '9ddee6d313b8df8d5c53bbbdff56ee8fad2b2a17'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 20:56:56 +0000 (20:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 20:56:56 +0000 (20:56 +0000)
     and 'cfb319cb7a07884581f37a430f62b7e11bfb6376'


Trivial merge