Merge pull request #81 from stephenfox/master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:59:45 +0000 (16:59 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:59:45 +0000 (16:59 +0400)

Trivial merge