From 03796f23373169f1e6374e9ab63cf6571f5d089f Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 3 Jul 2011 19:03:06 +0100
Subject: [PATCH] Merge branches 'next' and 'next' of
 git://gitorious.org/fg/simgear into next