From 5c6698b720573a182d5d451991113753fc645164 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Thu, 23 Aug 2012 20:15:35 -0700
Subject: [PATCH] Merge branches 'px4dev_new_param' and 'px4dev_new_param' of
 https://github.com/PX4/Firmware into px4dev_new_param