merge of '6b3a4b7868d3ebe4f5c8cf504377475025fcaaed'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 13:03:54 +0000 (13:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 13:03:54 +0000 (13:03 +0000)
commitf58205cdfbfb8ec787a0bd0d57a4381fbb56c099
tree47e76ef30bb177b1dce648dc38823a7240f86150
parentcb16d37cdee753f5ddea2c9836fc52eb6b39172c
parent99f9551474c954bdd007e11a3a267c9904d52ff6
Merge ... '6b3a4b7868d3ebe4f5c8cf504377475025fcaaed'
     and 'f66c5a130f53c8844d10944787f479687058e418'