From e81b617a09fb8951786a538ab5719ddcac609a3b Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Thu, 9 Jun 2011 17:09:19 +0200
Subject: [PATCH] Merge branches 'railsupdate2314' and 'master'