merge of '340559c2b56b28b0709e19affb5506c4d8727bc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 05:16:04 +0000 (05:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 05:16:04 +0000 (05:16 +0000)
     and '7636a76a892fc7f94dd1f4061fef697b8e314676'


Trivial merge