condition stuff, merge
commitb2c09b40c436e7863337d8ab92cd42dbaba13875
authorGary Warren King <gwking@franz.com>
Thu, 17 Sep 2009 00:54:30 +0000 (16 17:54 -0700)
committerGary Warren King <gwking@franz.com>
Thu, 17 Sep 2009 00:54:30 +0000 (16 17:54 -0700)
tree4e6788edd03afc64b128143c3172bffae3ea235b
parent43ae19d2aa465b845d3650f913585c5aa605d55a
parent1bac22ee586e6106b99d243548185ffddb404747
condition stuff, merge