merge of '8ebde0d924303d9679c25c10e4671740f5d732bb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:46:06 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:46:06 +0000 (09:46 +0000)
     and 'a011f99d8663ce45f2473866131d2b49f5701ed5'


Trivial merge