tree ac6864d790590c6b3fa0178072921eb041e155d3
parent 8cc7c3952d4d0a681d8d4c3ac89a206a5bfd7f00
parent d67c3f2cd92aed2247bfa8a9da61a902b7b2ff09
author Anthony Liguori <aliguori@us.ibm.com> 1313153416 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1313153416 -0500

Merge remote-tracking branch 'kraxel/seabios' into staging