merge of '2d6a2dde48f3ee16a543a024c093a47c012f1427'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 10:24:16 +0000 (10:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 10:24:16 +0000 (10:24 +0000)
     and 'e473c8fe889e2c7c34d1435fd6da787b4ece049c'


Trivial merge