merge of '08b850dd4e1df4e1751532b79a9685dd41464df7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 10:27:56 +0000 (10:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 10:27:56 +0000 (10:27 +0000)
commit32aea580856e66c6fedad2f1dd7246f7c1a8eee0
tree962b5b4d5516dcda2cbaaf92be951a293d48ba1c
parent26c785056eb873aabb62a9453b08e546e2ffcf0b
parent9a2b3931df3f7fb7fbde7ea420cf58f78bf5ae62
Merge ... '08b850dd4e1df4e1751532b79a9685dd41464df7'
     and 'e79716efdd36e7696ebd0ad656d58dbc0edd904c'
packages/p4/p4.inc
packages/tasks/task-bootstrap-unionroot.bb
packages/tasks/task-bootstrap.bb