merge of '38a9dd2ba2b2469b6368cf23490a2f8d5fec3065'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:41 +0000 (19:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 9 Mar 2008 19:02:41 +0000 (19:02 +0000)
     and 'd06ab8ea3c49e1734c6984d23d283558d4aef52c'


Trivial merge