merge of 85319fa61d0c4e459749097283b01b6a22ddca01
authorJamie Lenehan <lenehan@twibble.org>
Tue, 30 May 2006 14:20:29 +0000 (14:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 May 2006 14:20:29 +0000 (14:20 +0000)
commit7e869c76a29da07699491dbe9bc73134864e05d6
tree5f015a3dddfe54a3662c669e4e19a80ca39d847e
parent57fbd1ab5141c0ec39dd59cea888b6432e20485a
parenta8c0cfd39c545a5aec874b8ef7e0837f6b7d8f38
merge of 85319fa61d0c4e459749097283b01b6a22ddca01
     and 88838f9bcc31f610d3e4816c4727c1d802236945