Merge branch 'master' into graph-product
authorNeil Smith <neil.github@njae.me.uk>
Mon, 5 Mar 2012 16:56:49 +0000 (16:56 +0000)
committerNeil Smith <neil.github@njae.me.uk>
Mon, 5 Mar 2012 16:56:49 +0000 (16:56 +0000)

Trivial merge