commit 177cd59799aaf8e92e34e4caeaaf49f4ca26e35a Author: BJ Dierkes <wdierkes at rackspace.com> Date: Wed Apr 18 16:42:56 2012 -0500 Merge branches 'f17' and 'master'