merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Nov 2007 21:44:05 +0000 (21:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Nov 2007 21:44:05 +0000 (21:44 +0000)
     and 'ab14a7f33b13f2205a64293e2f2e29b20e943bf3'


Trivial merge