Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)
commit68de42d59d7070bc58f25cb13ad159d8c70aafc6
tree21500d67e5b877454697d447af2f883272877081
parentf8bd9b146076c9620d34a45fed41e4c069e96c32
parent362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster