Merge remote branch 'remotes/origin/master' into server
authorArtem Daniliants <artem@daniliants.com>
Fri, 5 Mar 2010 13:34:18 +0000 (15:34 +0200)
committerArtem Daniliants <artem@daniliants.com>
Fri, 5 Mar 2010 13:34:18 +0000 (15:34 +0200)

Trivial merge