merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:34:07 +0000 (00:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 00:34:07 +0000 (00:34 +0000)
commit2f8521c6d1173dd650d9ae2bba8c18e690fa3b1f
tree06bc2b997b60797bc42f696f3427f92890089d2b
parent0d0bf315513039bd8560ac91865c7174e789d675
parent6e90aae26efa66553063b74b9afa9563b70fb982
Merge ... '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
     and '6ab53da82d157971966f5a17d0c29d54df22cac9'