merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Oct 2007 16:35:01 +0000 (16:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Oct 2007 16:35:01 +0000 (16:35 +0000)
commit2b94d96062ac7eb6a15445f74e424b7b08e69a63
treea4ceb58e4985908f2dd574d498e1e17f38061f5e
parent51d88fa521229df09a9d624618d7e861d765d21a
parent0ed630ee92d26828b61f1de72dc0b33d2a056123
Merge ... '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'
     and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'