From e443372e7cff12f7eace32dca64136dd6e350db0 Mon Sep 17 00:00:00 2001
From: Gustavo Cruz <gustavo.cruz@colosa.com>
Date: Fri, 30 Nov 2012 12:11:07 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'