Merge branch 'fixes' into new_style
authorIustin Pop <iusty@k1024.org>
Mon, 30 Jun 2008 05:20:25 +0000 (07:20 +0200)
committerIustin Pop <iusty@k1024.org>
Mon, 30 Jun 2008 05:20:25 +0000 (07:20 +0200)
commit9097253d593c71213174591175d1f3497a5b357c
tree38dba457f917f6f4047908615290a7f2b86749c0
parent64ee880b1cbf6d1e1c3343c8f463257b447d1211
parent433c58520ad549e79f8233abd9793536d7d6f48d
Merge branch 'fixes' into new_style

Fixed conflicts in:

xattr.c
xattr.c