merge of '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 09:53:22 +0000 (09:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 09:53:22 +0000 (09:53 +0000)
     and '9a0857ebdef17f18989f0702e43595ce522a7a24'


Trivial merge