merge mainline into arm
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 11 May 2013 08:24:37 +0000 (10:24 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 11 May 2013 08:24:37 +0000 (10:24 +0200)

Trivial merge