Commit 13b43cfad14554503d08e687ba8f6e0a917e2b1d

Con Kolivas 2011-07-03T00:28:51

Update copyright and authors.