Merge branch 'release-0.2.7'
authorTomás Touceda <chiiph@leap.se>
Fri, 26 Jul 2013 13:45:29 +0000 (10:45 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 26 Jul 2013 13:45:29 +0000 (10:45 -0300)

Trivial merge