Merge branch 'next' into vivian

Conflicts:

	src/AIModel/AIBallistic.cxx
	src/AIModel/AIBase.cxx

diff --cc src/AIModel/AIBallistic.cxx
index 2ffaad6a5aba85b2c6ddfe027da0e62fa1b73385,7fa1474302d2c1c7840fc2b3a335947007c55612..aaf52337093a0ec7d9eaebb82ec8bd1d08137e77
--- 1/src/AIModel/AIBallistic.cxx
--- 2/src/AIModel/AIBallistic.cxx
+++ b/src/AIModel/AIBallistic.cxx
@@@ -45,6 -45,8 +45,7 @@@ _ht_agl_ft(0.0)
  _azimuth(0.0),
  _elevation(0.0),
  _rotation(0.0),
 -_formate_to_ac(false),
+ _elapsed_time(0),
  _aero_stabilised(false),
  _drag_area(0.007),
  _life_timer(0.0),
@@@ -60,14 -62,12 +61,13 @@@ _slave_to_ac(false)
  _slave_load_to_ac(false),
  _contents_lb(0),
  _report_collision(false),
- _report_expiry(false),
  _report_impact(false),
  _external_force(false),
+ _report_expiry(false),
  _impact_report_node(fgGetNode("/ai/models/model-impact", true)),
 -_old_height(0)
+ hs(0),
- _elapsed_time(0),
- _speed(),
- hs(0)
 +_old_height(0),
++_speed()
  
  {
      no_roll = false;

diff --cc src/AIModel/AIBase.cxx
index 28c2d3892731a0aa8f1e1472bd77a7c39507f019,9471a770b5184d320d3d4f5446f1b089990c07fb..8a073eb6d3b4c8448471d522122d810c5acd6232
--- 1/src/AIModel/AIBase.cxx
--- 2/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@@ -53,6 -53,8 +53,9 @@@ const double FGAIBase::lbs_to_slugs = 0
  using namespace simgear;
  
  FGAIBase::FGAIBase(object_type ot) :
++    _max_speed(300),
+     _name(""),
+     _parent(""),
      props( NULL ),
      model_removed( fgGetNode("/ai/models/model-removed", true) ),
      manager( NULL ),

diff --cc src/AIModel/AIEscort.cxx
Simple merge