merge of '124fe75a3b9c5f57669cab2b1f729871b642205b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 16:09:26 +0000 (16:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 16:09:26 +0000 (16:09 +0000)
     and 'e7392dcc74d2fbda5883939005e2fad09efab025'


Trivial merge