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)
commit0f7aeee64915f4befa798d26508aa18ae293c01b
tree3eaa13874954ab2ec6314228c8e25ac9169b1c16
parent0a395815112226458111aa55d6f1ab2d4de4ab6c
parentce8e801d9b95f70dbffff6e8d7de4df67478ff29
Merge ... '8ebde0d924303d9679c25c10e4671740f5d732bb'
     and 'a011f99d8663ce45f2473866131d2b49f5701ed5'