Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 20:41:53 +0000 (09:41 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 20:41:53 +0000 (09:41 +1300)
commitb34d5c8ef8661177bfface62115f8700f0a8db9c
treebd78f552abdee5538222a1b896c919286bc456f1
parent12741cfafa7513ee7b4627863c18346cb8507873
parent81f9c4976c171aae6e7f630dc8eb27a3e5424bb0
Merge remote branch 'kc/new/bug_5327' into kcmaster