Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 17:59:55 +0000 (06:59 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 21 Mar 2011 17:59:55 +0000 (06:59 +1300)
commitbbdaaec7a5b6e43708dbaa3e5c321af158a3a4d9
treecd1f5b0b13147029009ed2f40bc90bae99baa523
parent514f84a6ac2cd450098b1c9adc855f1d33417766
parentc5ba37bb9ab4d315077ed79d078f11de702e9dc2
Merge remote branch 'kc/master' into new/enh/bug_5917