Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:08:50 +0000 (09:08 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:08:50 +0000 (09:08 +1200)
commit35e3aa9a3758a62f00c430b017fa9ce90dc36def
tree8c79bd32e97babd2fbd7cc6e6a6f4f29c9864157
parent507c7f422485aaf7ae601b0a84bacdbaedac061c
parent6a6edfeec8c1bb3ad090be49dbb175b0d9cbd432
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster