merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 02:46:40 +0000 (02:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 02:46:40 +0000 (02:46 +0000)
commit13fe1a5480c8bc85a9a751672ae4d5c6295533a0
tree0477f64bd4758019adeb4604a0598bbbc268339c
parent9b188ea2600bce6ed35559b21677bd8b7223f5a8
parenta56f5680381313b9a12a3ba133c5cb7a2154aa67
merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
     and 9fe7f397fe86e4dfdbe20606d124c3211e58b813