From 6794e743564662b17510e61fc6b5a42e5de9b594 Mon Sep 17 00:00:00 2001
From: Erik Youngren <artanis.00@gmail.com>
Date: Sun, 25 Jul 2010 22:20:37 -0700
Subject: [PATCH] Merge branch 'master', remote branch 'peterix/master'