Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-12-31 10:33:39 +01:00
7 changed files with 8 additions and 53 deletions

View File

@@ -20,8 +20,7 @@ bin/rmdir
bin/sleep
bin/sync
bin/true
#bin/uname
bin/uname.bak
bin/uname
etc/dircolors
usr/bin/[
usr/bin/basename