merge of '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:46 +0000 (19:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 19:39:46 +0000 (19:39 +0000)
     and '887e1a4016c96ca69eca2047591511a955459515'


Trivial merge