merge of '96bb64a3731e126f99a327d5a0e1146bddcc95e0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:20 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 6 Aug 2007 15:20:20 +0000 (15:20 +0000)
commit536be8a5c6846d5ff1fc4eb43bff0c04928deb57
treec867be615610303a1cecd2f2548af0ac9f63fada
parentea5bb3df1fdbc3c166cd4bc49f73fca1b589e3a2
parent8b5e11c2bafe4f22848b24b8d96df02bf23849be
Merge ... '96bb64a3731e126f99a327d5a0e1146bddcc95e0'
     and 'e12a3eaad302fcad2de2f62fbf765f1058f626cd'