Merge upstream CM-10.1

commit 2dd5375a8f04fa713478954a01a478de31db9c94
Merge: 2aa5f49 cca9a66
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Mar 16 12:45:17 2013 -0700

    Merge "Phone : add french translation" into cm-10.1

commit cca9a66c7acb0ce8aac42c8311845fb02cc87a40
Author: DelPETER <delphinpeter@gmail.com>
Date:   Wed Mar 13 23:21:12 2013 +0100

    Phone : add french translation

    Patch set 1 : initial commit
    patch set 2 : correction

    Change-Id: Ifa7d0a82b61e8cb0edba464ab782999dc0438701