From 70e80795cfa92a31efbd29d2fed0392a1b89e60a Mon Sep 17 00:00:00 2001
From: Andor Salga <andor.salga@senecac.on.ca>
Date: Fri, 15 Jul 2011 14:36:36 -0400
Subject: [PATCH] Merge branches 'staged' and 'bug160' into staged