Merge remote branch 'amitay/tevent-sync' into 1.13
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:39:52 +0000 (08:39 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:39:52 +0000 (08:39 +1000)

Trivial merge