merge of '09891fc0c32d5edbc72b7bc758c18272982e4a8c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 00:04:03 +0000 (00:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jan 2008 00:04:03 +0000 (00:04 +0000)
     and '41dbabec846e09b57a641cc8b83bf24be8cf0dff'


Trivial merge