Merge branch 'master' of git+ssh://niniel.sysnet.ucsd.edu/home/mvrable/local/bluesky
authorMichael Vrable <vrable@cs.hmc.edu>
Sun, 22 Jan 2012 20:20:30 +0000 (12:20 -0800)
committerMichael Vrable <vrable@cs.hmc.edu>
Sun, 22 Jan 2012 20:20:30 +0000 (12:20 -0800)

Trivial merge