Merge commit 'origin/pheeror'
commit939c3b50aaa20b3d11cbcb7917a6cc9aeb80e87d
authorTomas 'ZeXx86' Jedrzejek <zexx86@gmail.com>
Wed, 6 Aug 2008 11:14:16 +0000 (6 13:14 +0200)
committerTomas 'ZeXx86' Jedrzejek <zexx86@gmail.com>
Wed, 6 Aug 2008 11:14:16 +0000 (6 13:14 +0200)
tree498bcbba09078d595a020e1c76e758466f83ccb8
parentc2da6753793ba9f54fb04e895064c8377aa08b30
parent5b3d6f0696fd041c440596e21745ff2104f8c953
Merge commit 'origin/pheeror'

Conflicts:

kernel/core/vfs.c
kernel/core/commands.c
kernel/core/vfs.c