From a5c57902e8844189e853ee2da0a815b2f8e57a10 Mon Sep 17 00:00:00 2001
From: Andor <andor@c-leungs-macbook-pro-2.local>
Date: Fri, 9 Jul 2010 11:18:22 -0400
Subject: [PATCH] Merge branches 'master' and 'bug22'