merge of '353149ddd8838914505a55ea3b29c0e9a586313f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 23:26:27 +0000 (23:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 23:26:27 +0000 (23:26 +0000)
commit6363e3b999c1600278e2f65cde6e3f839211299d
tree2047196ab7e32db255caa8a936dd1bf8c7b6640b
parent5103e92b8dd8f2dc85acaa5c46b2b3641b109bb2
parent89f8f2f11ff38add6164bc6e5728fda2b1132583
Merge ... '353149ddd8838914505a55ea3b29c0e9a586313f'
     and '908f030111fed03649b332c926739ffdd2d5eeb1'