merge of '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 18:49:01 +0000 (18:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 18:49:01 +0000 (18:49 +0000)
commitec95d714fa220eb3e2c42722b03f50a86408fc11
treee628bc43caba5c174300bf037f687ab808843f29
parent43ff2adf1a6dc054f131d47bcc95fa0bada57d2d
parent303495b5ba8aa81aa3e3569fbf8231b690244dc4
Merge ... '5bba276288eaa8fa9d57001cdafb8cb332fcb78b'
     and '94fb88049d8aea8313c398d3df50af2d4646f619'