merge of '50e6b56f1469addca3c0756da42f227da6a71b4d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 16:45:14 +0000 (16:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 16:45:14 +0000 (16:45 +0000)
     and '716dc25622b5d7b692780c2376d47847483c9027'


Trivial merge