Merge remote-tracking branch 'origin/5.4' 49/11049/1
Sylvestre Ledru [Wed, 27 Mar 2013 12:15:56 +0000 (13:15 +0100)]
Change-Id: I93cc3ee86b6a59926c8f75dc12f32c20c0daf8f3


Trivial merge