Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 08:15:59 +0000 (21:15 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 08:15:59 +0000 (21:15 +1300)
commita0efd547de51b49e6a684ff10f3522e1be2d022f
tree3c23e708e3b03a63f43f393dc26d3d73b82f6532
parentb4c0bb323f74ce342cd122f06bfd35fbecc60307
parenteeaf2e7c9e461b77bc18fd1883cdb250642ab1bd
Merge remote branch 'kc/master' into new/enh/bug_5917