Merge branch 'master' of ssh://git.fsl.cs.sunysb.edu/scm/git/am-utils-6.2
authorChristos Zoulas <christos@zoulas.com>
Fri, 30 Dec 2011 20:56:34 +0000 (15:56 -0500)
committerChristos Zoulas <christos@zoulas.com>
Fri, 30 Dec 2011 20:56:34 +0000 (15:56 -0500)

Trivial merge