merge of '3447c93047f153922a4e64420c682c7b0d9f6e9a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 13:27:00 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 13:27:00 +0000 (13:27 +0000)
commit3be6440ea603e11e2f69afbf28fa38a0446ad189
tree6c5b675ac3dfae704e9efb5e2f42511ea8e973c5
parent4a8a75b38c0b7c7e5355710544a1d6eb82d539d9
parent40854207ad6c93495bcbd501c225542d48ffa07f
Merge ... '3447c93047f153922a4e64420c682c7b0d9f6e9a'
     and '46a58faaa47f475ec8dd3ab429bba9fc88b7b3a8'