merge of '4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 15:48:40 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 15:48:40 +0000 (15:48 +0000)
commit8d7824dc72be5193f1f22c631434eaef77dec5ce
treeead52f2f3f7b46ad34b5b0deeb58d253aab8623b
parent4c0c07d55cf2790fe9967c23719abb7aa15ed143
parent51ea046316b377551dfbbc7b95864f9dc21620e9
Merge ... '4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b'
     and 'd1b0e1fcb5380bef0abd58faae2693512c88903c'