Merge pull request #482 from pixelroot/master
authorAlex <info@pixelbits.de>
Mon, 17 Sep 2012 12:12:53 +0000 (05:12 -0700)
committerAlex <info@pixelbits.de>
Mon, 17 Sep 2012 12:12:53 +0000 (05:12 -0700)
bug fix


Trivial merge