Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 19:47:02 +0000 (20:47 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 19:47:02 +0000 (20:47 +0100)
ckdaily snapshot from 20110706
snapshot ships with ckc299.txt instead of ckc300, removed.


Trivial merge