Merge branch 'maint'

* maint:
  Update copyright for 2011

diff --cc LICENSE.txt
Simple merge

diff --cc ccache.c
Simple merge

diff --cc execute.c
Simple merge

diff --cc lockfile.c
Simple merge

diff --cc stats.c
Simple merge

diff --cc test.sh
Simple merge

diff --cc test/test_argument_processing.c
Simple merge