From a64ecf24be357348025b1f45b1687e24b6ff2b85 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 12 Jan 2011 23:47:19 +0100
Subject: [PATCH] Merge branches 'autoreload' and 'master'