merge of 3c86c52756303961aea53564fbb7f1a252a712ef
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 15:35:47 +0000 (15:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 15:35:47 +0000 (15:35 +0000)
commita61cf7f6dd513f1e9e3935c2955a817015a841b0
treecebe466c5870aca33018c10d9c8cc3845566ca2a
parent61f450b1440fb4a374b6dbd0d3cada721f777282
parent4d16218496558eef1d39ed7e70103c76fd31ea01
merge of 3c86c52756303961aea53564fbb7f1a252a712ef
     and 6542f29774b37dc17f38dd5226a42f85eb3f9abe