synched with trunk at revision 28841
authorNick Samarin <nicks1987@bigmir.net>
Tue, 18 May 2010 21:37:57 +0000 (21:37 +0000)
committerNick Samarin <nicks1987@bigmir.net>
Tue, 18 May 2010 21:37:57 +0000 (21:37 +0000)

Trivial merge