am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo

Merge commit 'c8390047bd2344032aca915816a8b91590835105' into kraken

* commit 'c8390047bd2344032aca915816a8b91590835105':
  Fix escaping of characters