From 804254fec5bccb26c9b69f0f1a0bbe7243733b60 Mon Sep 17 00:00:00 2001
From: Obsidian <stratosphere.programming@gmail.com>
Date: Mon, 4 Oct 2010 08:47:20 -0500
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'