Merge branch 'master' into sf
authoradam <anton@adamansky.com>
Mon, 12 Nov 2012 06:15:54 +0000 (13:15 +0700)
committeradam <anton@adamansky.com>
Mon, 12 Nov 2012 06:15:54 +0000 (13:15 +0700)

Trivial merge