merge of '80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 18:28:26 +0000 (18:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 18:28:26 +0000 (18:28 +0000)
     and '877bd2153580c3f0eb7238b370fb1ae786b7b992'


Trivial merge