merge of '3ceed45c9d4c44db45af90121464ecd4dfb6317c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Nov 2007 12:52:47 +0000 (12:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Nov 2007 12:52:47 +0000 (12:52 +0000)
     and '58f9cc3cc29b0ffac55233ed8b792c82479f05bc'


Trivial merge