Merge remote-tracking branch 'kc/new/bug_7060' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 15:09:49 +0000 (04:09 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 15:09:49 +0000 (04:09 +1300)
commitb6cc3acdac69a762f6aafdcaaac52cd31a1a200d
tree91328c126029e92fd58c3b2d86f2379ddca77b78
parent4a2a95cc254f0ed1d5fcd6ea7084a5b08ef04952
parentc5bc35b6945a03e27dd369d368be33d97f76e509
Merge remote-tracking branch 'kc/new/bug_7060' into kcmaster