merge of 'c3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Jul 2008 20:21:55 +0000 (20:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Jul 2008 20:21:55 +0000 (20:21 +0000)
commite9f4ec648f1eb3bc74dd65bdc5f99d61df9726ea
tree10d92da7eff47c07ad11b46b3ba2dea0dbbc76d6
parent40278a60d9052ede1a5d6484be57959f3650e1bd
parent2cbe083afe8cd29ff3e0fe3694b8fb08c23b3af6
Merge ... 'c3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958'
     and 'd07d8aef4aa26afe6c43c94383a0a14d31ed5c54'