Merge pull request #1 from pcercuei/for_upstream
authornotaz <notasas@gmail.com>
Wed, 9 Oct 2013 23:43:16 +0000 (16:43 -0700)
committernotaz <notasas@gmail.com>
Wed, 9 Oct 2013 23:43:16 +0000 (16:43 -0700)

Trivial merge