Merge remote branch 'upstream/master'
authorChris Bacon <chrisbacon76@gmail.com>
Thu, 12 Aug 2010 13:22:15 +0000 (14:22 +0100)
committerChris Bacon <chrisbacon76@gmail.com>
Thu, 12 Aug 2010 13:22:15 +0000 (14:22 +0100)

Trivial merge