merge of 171f7917626b9f4ae8dbf894b68c59b96f170e80
authorMika Laitio <lamikr@cc.jyu.fi>
Tue, 6 Jun 2006 23:28:48 +0000 (23:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 23:28:48 +0000 (23:28 +0000)
     and 858f7c62c0df0be80b72c0b207ec39feb0025305


Trivial merge