From 5a90792e0de432d61ebf13ec23ec0f8052570b1d Mon Sep 17 00:00:00 2001
From: brianleroux <brian@westcoastlogic.com>
Date: Tue, 31 Aug 2010 15:19:12 -0700
Subject: [PATCH] Merge branch 'master', remote branch 'dave/command_line'