Merge remote-tracking branch 'working/user/tsbere/adv_summary' into 20130313 collab/dyrcona/integration_20130313
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 14:03:05 +0000 (10:03 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 14:03:05 +0000 (10:03 -0400)

Trivial merge