merge from ag3 work
commitd0a3f771ff55297f1183c4d33b218b7b733fd210
authorGary King <gwking@franz.com>
Sun, 24 Jan 2010 17:57:16 +0000 (24 12:57 -0500)
committerGary King <gwking@franz.com>
Sun, 24 Jan 2010 17:57:16 +0000 (24 12:57 -0500)
treefa478675a11e92d61156754f0e807a6b5a117f20
parent05c1687a6c861df4f7fb687a3ca4177d41eb5527
parentf022fb4eb5c070c03c07bfaae02e1fbe4fdb4354
merge from ag3 work
lift.asd