merge of '19cba47403d3f84e9f053863d3371ac3af470966'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 07:27:16 +0000 (07:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 07:27:16 +0000 (07:27 +0000)
     and 'b8fa5480d2b2cfdbca87e0a6795f2eec374b08b4'


Trivial merge