Merge remote-tracking branch 'origin/4_4_x' into 4_4_x
authorZenQA <zenqa@Ubuntu12.04x64>
Fri, 11 Jul 2014 10:24:35 +0000 (15:54 +0530)
committerZenQA <zenqa@Ubuntu12.04x64>
Fri, 11 Jul 2014 10:24:35 +0000 (15:54 +0530)

Trivial merge