merge of '0bb67ca8b729200534e9fda164dd38051ee0ec16'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Aug 2007 13:53:33 +0000 (13:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Aug 2007 13:53:33 +0000 (13:53 +0000)
     and '1e604e78eb33aee9476c5e81446bb732dad83760'


Trivial merge