[Merge] lp:~inaddy/ubuntu/utopic/eiciel/bug-1361217 into lp:ubuntu/eiciel

[Sebastien Bacher]

setting as "work in progress", the changes are incomplete here it seems, feel free to set back to "needs review" when you address the previous review comment
-- 
https://code.launchpad.net/~inaddy/ubuntu/utopic/eiciel/bug-1361217/+merge/232122
Your team Ubuntu branches is requested to review the proposed merge of lp:~inaddy/ubuntu/utopic/eiciel/bug-1361217 into lp:ubuntu/eiciel.