Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 22:35:15 +0000 (11:35 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 22:35:15 +0000 (11:35 +1300)
commit7e08e0a6396ba99b4a6aad9f8c9aa1741a5bd6d3
tree1f5acd0ad391ebc179ff2b3f92c692cea1eecb2a
parentb34d5c8ef8661177bfface62115f8700f0a8db9c
parent3df717479cd7e19fef2d6d18300636391f1d2b5b
Merge remote branch 'kc/new/bug_5327' into kcmaster