merge of 73a040e1292f94333eab9d73425b9fdecf4da694
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 May 2006 12:48:28 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 May 2006 12:48:28 +0000 (12:48 +0000)
     and f33cef327c300a5f666b9a3f79571edc4225cfe0


Trivial merge