Merge branch script_roles
Tomas Doran [Sat, 22 Oct 2011 00:20:08 +0000 (17:20 -0700)]

Trivial merge