Merge branch 'befs' into phcoder
commit2518b0369d2966933140edd2eb44293b1eae4797
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 14:11:12 +0000 (17 16:11 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 14:11:12 +0000 (17 16:11 +0200)
tree279e3da973085db549e50f3002206cd2271d129e
parentb1bfd0a7de51091d78a18776c068433ab5c00b09
parentd60d0cab030e51db780f85ebe4f17e17a7f3c3c5
Merge branch 'befs' into phcoder

Conflicts:
conf/common.rmk
conf/i386-pc.rmk
conf/common.rmk
conf/i386-coreboot.rmk
conf/i386-ieee1275.rmk
conf/i386-pc.rmk
conf/powerpc-ieee1275.rmk
conf/sparc64-ieee1275.rmk