Merge branch 'master' of z:
authorPanagiotis Kanavos <pkanavos@gmail.com>
Mon, 30 Jan 2012 19:36:01 +0000 (21:36 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Mon, 30 Jan 2012 19:36:01 +0000 (21:36 +0200)

Trivial merge