Code

Set merge from trunk
authorJon A. Cruz <jon@joncruz.org>
Sun, 19 Dec 2010 06:59:26 +0000 (22:59 -0800)
committerJon A. Cruz <jon@joncruz.org>
Sun, 19 Dec 2010 06:59:26 +0000 (22:59 -0800)

Trivial merge