controls.png @ a15f1a3cf691

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Thu, 30 Jun 2011 09:16:20 -0400
parents	def464696a83
children	(none)

(binary:image/png)