merge of '21f54c80b635c2c7554e7423c333597138564f8d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:28:51 +0000 (12:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:28:51 +0000 (12:28 +0000)
     and '3e1b85fb027d607397b8ae0cf0cbedfbd3f273a2'


Trivial merge