Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 07:39:05 +0000 (20:39 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 07:39:05 +0000 (20:39 +1300)
commit7a71d2c5e8f5a6685b0382217f83c98f850ef269
tree78350de288afe2a5df20f6bd571af763afda95e6
parent77b6409802e6ce5612883ec6d22db9545547444a
parentb9cee99da4fea934c617eadf3cfac62c380c717a
Merge remote branch 'kc/master' into new/enh/bug_5917