merge of '1cf701ebedabbcfca1fb1b88f2077258b1dfd000'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 22:36:31 +0000 (22:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 22:36:31 +0000 (22:36 +0000)
commite749ddbc2ac37296c44da210f340df2b8c3c01fd
tree2b6b4c60e5934069bee1eb2bb03ba30e92850b20
parent29372d984aea1459b53957055bccc9650c05e7f1
parent7708f59344c8b55783cf0db2c19d846bc6f348b4
Merge ... '1cf701ebedabbcfca1fb1b88f2077258b1dfd000'
     and 'f8b059d4fa30751c4f6fddabedcf7b022798effe'