Merge remote branch 'kc/master' into new/enh/bug_5579
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 18:44:09 +0000 (06:44 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 18:44:09 +0000 (06:44 +1200)
commitc2043933f7f9b30bf87a4c5656c50fd10584ef4f
treed4735687f18f309dd9fd40e760c21b6b6206655a
parent2650446d2681e92eea1f2e4369496298540fcc27
parent6dc948c6ba01f9315127d8e5de6c1902da61902d
Merge remote branch 'kc/master' into new/enh/bug_5579