Merge branch 'master' into ticket3
authoradam <adamansky@gmail.com>
Sat, 10 Nov 2012 18:02:48 +0000 (01:02 +0700)
committeradam <adamansky@gmail.com>
Sat, 10 Nov 2012 18:02:48 +0000 (01:02 +0700)

Trivial merge