From a3c5920a2b4cf6e5a2770bb5333cc9fc3e735e55 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Thu, 9 Jun 2011 14:49:58 +0200
Subject: [PATCH] Merge branches 'ruby1.9' and 'master'