merge of '71b2a974e9dd890e2d240ddc1eaa4be6592e629e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 14:27:17 +0000 (14:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 14:27:17 +0000 (14:27 +0000)
     and 'e7bf5c0ee8097ad652cdcb00e38545e02e057855'


Trivial merge