Merge branch 'mainline' into nestpart
commitd2c4881131e77c809011138b4ee64212bcf43993
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 8 Jul 2009 07:19:40 +0000 (8 09:19 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Wed, 8 Jul 2009 07:19:40 +0000 (8 09:19 +0200)
treea9ce1e95d90c561b82d6fa9fc2b272175237f71f
parente041a42460165acfa8702ce415c94266964dfbe9
parentff4c1f801d56ee53bc61ac0d6a91f0d2a37b82c7
Merge branch 'mainline' into nestpart

Conflicts:
ChangeLog
ChangeLog
conf/common.rmk
conf/i386-coreboot.rmk
conf/i386-ieee1275.rmk
conf/i386-pc.rmk
conf/powerpc-ieee1275.rmk
conf/sparc64-ieee1275.rmk
loader/i386/bsd.c
util/hostdisk.c