merge of '8abbc6b27bdcde45d495d401b09e67def2993302'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Oct 2008 16:43:55 +0000 (16:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Oct 2008 16:43:55 +0000 (16:43 +0000)
     and 'f309dfd6b287a0b52a295b00b2a304b1badf5c57'


Trivial merge