Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 18 Aug 2011 09:13:12 +0000 (21:13 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 18 Aug 2011 09:13:12 +0000 (21:13 +1200)
commitf80185efc46b34952656e00e9c2a1054bd888f52
treee42062617033171e8f2946bd917d737e0f27a168
parent85e37cb4b5879b174759e955d37e1bfe832bc646
parenta41100a44519373efafb5c9f3cdc5607657d651e
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster