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)
     and 88838f9bcc31f610d3e4816c4727c1d802236945


Trivial merge