commit 72f0d81e1a60240b988a349e22572021279f9eb2 Merge: cbc726f ae3d381 Author: Bruno Wolff III <bruno at wolff.to> Date: Sun Apr 10 00:03:02 2011 -0500 Merge branch 'qa' custom/qa-test-day.ks | 62 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 16 deletions(-) ---