Merge remote-tracking branch 'origin/master' into ticket43
authoradam <adamansky@gmail.com>
Tue, 15 Jan 2013 17:35:57 +0000 (00:35 +0700)
committeradam <adamansky@gmail.com>
Tue, 15 Jan 2013 17:35:57 +0000 (00:35 +0700)

Trivial merge