Merge remote branch 'kc/new/bug_5370' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:42:52 +0000 (09:42 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:42:52 +0000 (09:42 +1300)
commit4a86a4de8c2fd0cb788d21172186f41ef829d741
treecd41dfd36d9c25be0595e0c45738ae3545107b60
parent07cfc5d69c83795a8ab1ad6168251f9aab9f87df
parent6df634855cc62a5f31b419ecd1946500bf576065
Merge remote branch 'kc/new/bug_5370' into kcmaster