From f09185dc71a6539d4867c8e541948fc98356787c Mon Sep 17 00:00:00 2001
From: James Taylor <james@jamestaylor.org>
Date: Tue, 29 Mar 2011 13:56:57 -0400
Subject: [PATCH] Automated merge with
 https://bitbucket.org/galaxy/galaxy-central