merge of '136745c1fbac40dee1623f707a662275abae9a7c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 11:52:46 +0000 (11:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 11:52:46 +0000 (11:52 +0000)
commit4159e3aa7dcf9b7343939547c3ba5c014e7641fd
tree07ab930376f656f60c0534c4e8123ded02cde384
parent5a283afc29cd7306253423d2794a5dfd695c58ee
parentcd6e181a4571f1f498b6207685d48f18fdd96548
Merge ... '136745c1fbac40dee1623f707a662275abae9a7c'
     and 'fef3069502758e3e525ba100fb180bf19f383f66'