merge of 'a20b528579d5908635ab78e38cfc45339051c775'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 12:05:59 +0000 (12:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 12:05:59 +0000 (12:05 +0000)
commit835ed979cce20205b335cd60510ad3d4db0adc6c
tree73d65e29b750e7af50de9a4031e2a70eb56a950c
parenta7cf5e75e8c088dc197e2b244941439f625aef5f
parent7eb93397481f734b3ef73a01c3655dcf79015941
Merge ... 'a20b528579d5908635ab78e38cfc45339051c775'
     and 'e37c01e1704cbba064751264442c502dfe81db47'