From 05c93266647f0f40b7dcd05f6d8a147edd35fdac Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Fri, 5 Nov 2010 01:41:44 +1100
Subject: [PATCH] Merge branches 'sti' and 'master' into sti