Merge branch 'develop' into sandybridge
authorZaheer Chothia <zaheer.chothia@gmail.com>
Wed, 20 Jun 2012 22:18:09 +0000 (00:18 +0200)
committerZaheer Chothia <zaheer.chothia@gmail.com>
Wed, 20 Jun 2012 22:18:09 +0000 (00:18 +0200)

Trivial merge