Merge remote-tracking branch 'amitay/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 22 May 2012 03:25:05 +0000 (13:25 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 22 May 2012 03:25:05 +0000 (13:25 +1000)

Trivial merge