merge of '42f626957035d9fc4496080e90c92e06f8a2070e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Dec 2007 21:50:13 +0000 (21:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Dec 2007 21:50:13 +0000 (21:50 +0000)
commit2256b7743ce7e5767a033c0682ced0e1f70dbf00
tree360498f80e885d8731cb749d0dee00a30d5416d6
parent1b8a1537161bc365d65677e70f98585752f7b3e6
parent225bf0a7ac03baa425e027b71c23dc1fece6f6ca
Merge ... '42f626957035d9fc4496080e90c92e06f8a2070e'
     and 'b1610df18b4d8070f056d9621c7826cf30b62bca'