merge of '76a1c51304038a511d0105e6d572f83c0a52994b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:34:51 +0000 (16:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:34:51 +0000 (16:34 +0000)
commit2dbe80ce729be31d8656ec7eefd62b27204bbc37
tree16d6e6a10a9d16e6b23599f52db9f28ec3893df2
parenta6b0d5898e3e33f8d26b03cf06b9c22208d32e3d
parent68a47e1f0194466395c63e8e2d2b4e44537fea0e
Merge ... '76a1c51304038a511d0105e6d572f83c0a52994b'
     and '859e2ad80476c0c2a7333efae72e37c9a644472f'