merge of '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:48:51 +0000 (09:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:48:51 +0000 (09:48 +0000)
commit60de79c7bae656914aa42424a1bb9cd7f0f62047
tree165740c0944887b7aea629f0b534fc52c2475d65
parent7b76801adbc8f161fcb5a96b07e7bded66ad6e4e
parentd8502e7f3ec9a49c40e71b3ebc4443e8cb129c2f
Merge ... '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
     and '85a8198c27d919f7d43639901b8c9925f284d7db'