Merge branch 'issue_4879' into master_tj
authorTJ <acontent@iam.tj>
Fri, 21 Oct 2011 15:49:21 +0000 (16:49 +0100)
committerTJ <acontent@iam.tj>
Fri, 21 Oct 2011 15:49:21 +0000 (16:49 +0100)

Trivial merge