Merge branch 'master' into id
authorAntony Chazapis <chazapis@gmail.com>
Wed, 4 Jan 2012 15:16:57 +0000 (17:16 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Wed, 4 Jan 2012 15:16:57 +0000 (17:16 +0200)

Trivial merge