Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:14:36 +0000 (23:14 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:14:36 +0000 (23:14 +1300)
commitc5fe424c0f826a16caf3674b66df638d18bc6449
tree2e5ddb46e3d6118646c661c195656c2debbdfaff
parent592bced8edfb6b71f1f19cd658910ccad6536ce9
parent3bb33fd666d4d0eea26114b373874189edc82459
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster