Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)
commit74b62cd752942b13b9e15a4d1e49ccf45b19ab69
tree2a764bd8df8d420236f0a42d5dacf80a54d8f761
parent35e3aa9a3758a62f00c430b017fa9ce90dc36def
parent282a2d60b830b22661cc0324a84b7c17b7b905d1
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster