Remove trailing whitespaces.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2

Conflicts:
	ChangeLog