Merge branch 'new_scripts'
Tomas Doran [Sat, 28 Nov 2009 12:30:09 +0000 (12:30 +0000)]

Trivial merge