merge of '1669749c4615b77d79a8df668ac9ce91730cf77a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 22:10:04 +0000 (22:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 22:10:04 +0000 (22:10 +0000)
     and '8f25eeb3d52cd94924df16c4c1790609c547ff6a'


Trivial merge