Merge https://github.com/nyov/xonstat into nyov-header
authorAnt Zucaro <azucaro@gmail.com>
Wed, 16 May 2012 23:39:44 +0000 (19:39 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Wed, 16 May 2012 23:39:44 +0000 (19:39 -0400)

Trivial merge