Merge remote branch 'kc/new/bug_5651' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:34:56 +0000 (15:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:34:56 +0000 (15:34 +1200)
commitb1daec9fa3aa3636e8f7e6c724305ec4f7e492c1
tree36031cd27b25adf4eda5a28db77c1270cfadd2a6
parente43da19e34745d734ab6ee5cb5540e4d6e92adf3
parentad206a73f867f6a184f64d41e4ccfa8e5bb0cd21
Merge remote branch 'kc/new/bug_5651' into kcmaster