Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Tue, 28 Oct 2014 18:16:01 +0000 (14:16 -0400)
committerrsiddharth <rsd@gnu.org>
Tue, 28 Oct 2014 18:16:01 +0000 (14:16 -0400)

Trivial merge