From 0c8a3c61c11346bef3300d2e4b72c2d743e23fb3 Mon Sep 17 00:00:00 2001
From: Rory O'Connell <rory-oconnell@uiowa.edu>
Date: Thu, 15 Apr 2010 16:21:42 -0500
Subject: [PATCH] Merge branches 'ber-cleanup' and 'master'