merge of '5156b0a1647a5b55a939de58b3824e987070afee'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 18:42:27 +0000 (18:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 18:42:27 +0000 (18:42 +0000)
     and '7679548c35575ac65d8c4678ed5c0551529a56b6'


Trivial merge