Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 16 Jul 2011 08:21:47 +0000 (20:21 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 16 Jul 2011 08:21:47 +0000 (20:21 +1200)
commit408543294e69797d7258621e26b83736474caac8
tree61dfe1163afa6948a77269061c829efd6bcc034b
parentefc0851a49fb41d7d1b9be817983ca035990b2c2
parent94e3177983f3905a4a3d330a5b82598b42dd3f34
Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster