Merge remote-tracking branch 'upstream/4.8'
authorSergio Ahumada <sergio.ahumada@nokia.com>
Sat, 26 Nov 2011 23:16:08 +0000 (00:16 +0100)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Sat, 26 Nov 2011 23:16:08 +0000 (00:16 +0100)
commit56de386b1e50fe189fd7434c6502752c3a5b30d3
treedd0742d8d8f1ac20b78a5142b81a78ad89158b5c
parentb34884821c9a1e514d831f6aa3dbc1d2156fc755
parentf48870f8efbcf7ca4e344e48e4f61334f35b9c6c
Merge remote-tracking branch 'upstream/4.8'