Merge branch 'topic/stratus' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 7 May 2012 15:23:27 +0000 (09:23 -0600)

Trivial merge