Merge commit '695c71e20f5a068757525453e76792914b15b2bd'
authorChristos KK Loverdos <loverdos@gmail.com>
Fri, 22 Jun 2012 13:27:08 +0000 (16:27 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Fri, 22 Jun 2012 13:27:08 +0000 (16:27 +0300)

Trivial merge