merge of '147ea1808ce9dcca465549615b959e4aedc81359'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 12:51:37 +0000 (12:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 12:51:37 +0000 (12:51 +0000)
     and '75803ac499b6e7802ec35d07693154274da0770c'


Trivial merge