Merge remote branch 'origin/master'
authorJan Wieck <JanWieck@Yahoo.com>
Thu, 16 May 2013 21:26:38 +0000 (17:26 -0400)
committerJan Wieck <JanWieck@Yahoo.com>
Thu, 16 May 2013 21:26:38 +0000 (17:26 -0400)

Trivial merge