merge of '32d243e53a633a69a4061e712897dae706da9eee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 10:57:13 +0000 (10:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 10:57:13 +0000 (10:57 +0000)
     and '816470cc5a58c92e0a2b36e6ca0db599d2cf7e38'


Trivial merge