agalma: updated sha1
Merge branch 'agalma'