Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 3 insertions, 3 deletions

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index 4e2daf5a..af63ed17 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -21,19 +21,19 @@ public class AltosSpeed extends AltosUnits {
 
 	public double value(double v) {
 		if (AltosConvert.imperial_units)
-			return AltosConvert.meters_to_mph(v);
+			return AltosConvert.meters_to_feet(v);
 		return v;
 	}
 
 	public String show_units() {
 		if (AltosConvert.imperial_units)
-			return "mph";
+			return "ft/s";
 		return "m/s";
 	}
 
 	public String say_units() {
 		if (AltosConvert.imperial_units)
-			return "miles per hour";
+			return "feet per second";
 		return "meters per second";
 	}