Merge remote-tracking branch 'itseez/master'
authorOzan Tonkal <ozantonkal@gmail.com>
Wed, 18 Sep 2013 07:44:37 +0000 (08:44 +0100)
committerOzan Tonkal <ozantonkal@gmail.com>
Wed, 18 Sep 2013 07:44:37 +0000 (08:44 +0100)

Trivial merge