From 99bfd4c47de3aa77cbd0a8072f4eaa0fe6606905 Mon Sep 17 00:00:00 2001
From: Craig Meyer <meyercr@intellar.com>
Date: Thu, 4 Aug 2011 18:40:40 +0000
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'