Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Jun 2011 23:46:12 +0000 (11:46 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Jun 2011 23:46:12 +0000 (11:46 +1200)
commit21c8a87b781c1e13f98de5dc26d6e5a7f3dc69fd
tree1b608be92d90a6d6f8e4a2bcb25cd8e0d616cd79
parentf6486e63904f728fbdf5a9def8082777a101c64f
parenta3717c1fe91401aee9d2c89ffe6dc3394b4892e1
Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster