Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 08:08:42 +0000 (21:08 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 08:08:42 +0000 (21:08 +1300)
commit514f84a6ac2cd450098b1c9adc855f1d33417766
treee7f2ff7afd2e7600b4641041240109cdd7e3237c
parent01f7ea0d28683158cac27ca006000c57b8149c99
parente158f86d20fbe8b4fb9d3d2e453712b83c7a3cee
Merge remote branch 'kc/master' into new/enh/bug_5917