From 6ff6d7556c760bfb784249b63c5610e53f891a9e Mon Sep 17 00:00:00 2001
From: athile <athile.g@gmail.com>
Date: Mon, 30 Aug 2010 02:23:52 +0100
Subject: [PATCH] Merge branch 'master', remote branch 'origin'