From 701bd2c7f420ee90c6321dd213f61e9455f2016e Mon Sep 17 00:00:00 2001
From: Bryan Berry <bryan@olenepal.org>
Date: Thu, 25 Feb 2010 14:48:02 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline into bryan

---
--
cgit v0.9.1