Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 18:05:03 +0000 (07:05 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 18:05:03 +0000 (07:05 +1300)
commitcac6eb12502f82ed5a0b59a74cf84fa009ba0a26
treef3090feee66c85b72d67c39d5feba8a32af99fef
parent05be38d438c242496a5c205fffefcfbdfdb63d46
parentc01fcbf97306d6fdcea001dbceaa4dc79c63239a
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster