From 35779cfafc96131342fdb2ff475f7f6a8cd8f079 Mon Sep 17 00:00:00 2001
From: "Curtis L. Olson" <curt0001@flightgear.org>
Date: Tue, 25 Oct 2011 09:31:18 -0500
Subject: [PATCH] Merge branches 'next' and 'next' of
 gitorious.org:fg/flightgear into next