Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable
authorIan Beckwith <ianb@erislabs.net>
Sun, 11 Dec 2011 02:19:09 +0000 (02:19 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 11 Dec 2011 02:19:09 +0000 (02:19 +0000)
i.e. upstream master branch as of Sat Dec 3 13:09:58 2011 +0100


Trivial merge