merge of b14eb00575e3edb8659a9f31c47e1416187938b7
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Mar 2006 20:05:08 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 20:05:08 +0000 (20:05 +0000)
     and d666453b1d27ca8088768cfc910fd4bd31f2682c


Trivial merge