Merge branch 'befs2' into phcoder
commit33989a29dcde72d0e4c5c7ca7f5e5be66a583a33
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 21:16:56 +0000 (17 23:16 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 21:16:56 +0000 (17 23:16 +0200)
tree4ba294d10ab0aeea45273ae804d1c1e6cc2bc46b
parent6fbe0b77cecce1acff5184b234c2314686133a9b
parentebc0e153ac08aafaaa15bb057eebcfc2a4b2b576
Merge branch 'befs2' into phcoder

Conflicts:
conf/common.rmk
conf/i386-pc.rmk
fs/befs.c
ChangeLog