merge of '059498b6c4f13f5dfa1e6c21a17742c9c506dc06'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 18:24:28 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 18:24:28 +0000 (18:24 +0000)
commit371f3078009b7e3cf08478bcebe84fe55cbcbab9
tree34b1c80af1b539fefb8ea849834f9159bd39511e
parentde22532e68a443bbfa5bf9af194ee0be2704ea9d
parent8a0b3d3e7ac9a6e721916f945701874e4eb97148
Merge ... '059498b6c4f13f5dfa1e6c21a17742c9c506dc06'
     and '37c001885fbd1b66958b92b288dcb0c2e2024213'