Merge branch 'setterargs'
authorjeresig <jeresig@gmail.com>
Thu, 7 Jan 2010 19:26:06 +0000 (14:26 -0500)
committerjeresig <jeresig@gmail.com>
Thu, 7 Jan 2010 19:26:06 +0000 (14:26 -0500)

Trivial merge