Merge branch 'master' into sdk-0.0.1
authorAndoni Morales Alastruey <ylatuya@gmail.com>
Thu, 7 Jun 2012 00:55:28 +0000 (02:55 +0200)
committerAndoni Morales Alastruey <ylatuya@gmail.com>
Thu, 7 Jun 2012 00:55:28 +0000 (02:55 +0200)

Trivial merge