Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 19 Jul 2010 01:30:33 +0000 (13:30 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 19 Jul 2010 01:30:33 +0000 (13:30 +1200)
commit4d6b38c794115586f03bf1ca7c0f22dae13c19af
tree091346d36c7c376659270cd6c2a0dd725cf7bf4f
parentb2112eac49ca121969be4790a3ad0cbe526bc753
parentebf7f0cad0148e3ab859fd8bd572794a19f40361
Merge remote branch 'kc/master'