Merge branch 'master'
authorChristos KK Loverdos <loverdos@gmail.com>
Mon, 24 Sep 2012 08:08:47 +0000 (11:08 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Mon, 24 Sep 2012 08:08:47 +0000 (11:08 +0300)

Trivial merge