Merge branch 'dfsg_clean'
commit9350f29cfe32956209d4e6c965b232d07598231b
authorJiri Palecek <jirka@debian.(none)>
Mon, 1 Jun 2009 14:10:54 +0000 (1 16:10 +0200)
committerJiri Palecek <jirka@debian.(none)>
Mon, 1 Jun 2009 14:10:54 +0000 (1 16:10 +0200)
tree35a9a0b9ea917aad5ac52232370ba8aa2daa272e
parent364cda078011cf55b76ff6be4e324aca15479ad7
parent0e6c48a76f7604e663b8550361c11fc0395177fd
Merge branch 'dfsg_clean'

Conflicts:
doc/man1/ltp-bump.1
doc/man1/ltp-pan.1
runltp
runtest/ltplite
runtest/stress.part3
testcases/commands/unzip/unzip_tests.sh
doc/man1/Makefile
doc/man1/ltp-bump.1
doc/man1/ltp-pan.1
runltp
runtest/ltplite
runtest/stress.part3
runtest/syscalls
testcases/commands/ade/file/file_test.sh
testcases/commands/unzip/unzip_tests.sh
testcases/kernel/controllers/Makefile
testcases/kernel/syscalls/chown/chown03.c