Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Oct 2011 20:45:39 +0000 (09:45 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Oct 2011 20:45:39 +0000 (09:45 +1300)
commitf2794f79342e48bc433f0d56ea8baf5ef0bba526
treec83e8a1b4a84d384e21097f6b0a47b58723fecd0
parent8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96
parentbc33391fc5491e0acbc9431d3a6b24c4f357ff79
Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster