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)
     and 'e12a3eaad302fcad2de2f62fbf765f1058f626cd'


Trivial merge