Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Jul 2010 03:02:45 +0000 (15:02 +1200)
committerChris Cormack <chrisc@catalyst.nz>
Thu, 8 Jul 2010 03:02:45 +0000 (15:02 +1200)
commit89afee2810dc245e5be440f91f501adfc047a2f5
treea38c6fa92130287d5fcafdf6cbe1b8670b016610
parentf46abf8b909257a54c9e2c1fdd999ba30c7ac0ae
parent6127553c4494393beb3cec6bc534db0db079a5a9
Merge commit 'kc/master'