merge of '3506b9987e9cac2db68bfd55cff9ee2f989aa053'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Apr 2008 07:28:52 +0000 (07:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Apr 2008 07:28:52 +0000 (07:28 +0000)
     and '387792ddbaa8e8b90a0c30519d749b13371a81b6'


Trivial merge