Fixed up some leftover git merge dingleberries.
authorAustin Hastings <Austin_Hastings@Yahoo.com>
Fri, 12 Mar 2010 15:03:21 +0000 (10:03 -0500)
committerAustin Hastings <Austin_Hastings@Yahoo.com>
Fri, 12 Mar 2010 15:03:21 +0000 (10:03 -0500)
commit8d6b40af38a9c9dd657d9414487dfd6fe9accad3
tree519d6f99aacdf5cca26cf78887ea417e329cf71f
parent4aa25278b59ba9263fd859753d0947cec55d8d12
Fixed up some leftover git merge dingleberries.

Signed-off-by: Austin Hastings <Austin_Hastings@Yahoo.com>
setup.nqp