merge of '4c917e13bc231f8325cbb2478d7907d3ccc3f75b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 15:08:45 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 15:08:45 +0000 (15:08 +0000)
commit3c79ebc3154b9fc440816b544233b9ad26e31796
tree4d699630ffa9a28a37fec4c4f2a02fb6bc771c64
parent44b4d9e022a91a08240d4175d6dd94b9d2c7ceee
parent55acada06b6e0a678e8d45334a395ba28ce506a6
Merge ... '4c917e13bc231f8325cbb2478d7907d3ccc3f75b'
     and 'a8fa0920a4e1dd5e47ce36f4fa80c505684b4c46'