merge of '2ef8a2b13a8a5d81ce6663db27657a18b66de8cb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Aug 2007 08:32:03 +0000 (08:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Aug 2007 08:32:03 +0000 (08:32 +0000)
     and '81722d85338d326b44bc58a0fe61f15c7fbd724f'


Trivial merge