merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:49:03 +0000 (19:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:49:03 +0000 (19:49 +0000)
     and 'e3bce18db3557d05994587f4a53578acbc1f3792'


Trivial merge