From c3f0d101998601950e44bd201de6238250246beb Mon Sep 17 00:00:00 2001
From: Barry Silverman <barry@ubuntu-lynx.(none)>
Date: Sun, 19 Dec 2010 12:01:44 -0500
Subject: [PATCH] Merge branches 'ed' and 'master' into ed