Enable prelink on otoro, unagi, keon, inari, leo, hamachi by default.
Merge pull request #234 from ting-yuan/enable_prelink

Enable prelink on otoro, unagi, keon, inari, leo, hamachi by default.
Remove hardware-qemu.ini from list of files for emulator package
Revert "Enable prelink on otoro, unagi, keon, inari, leo, hamachi by default."

This reverts commit 06496d980548debc8a9c59bb85279582d5b2ea5f for breaking v1-train builds.
Add peak support
Add Peak to printed list of supported devices
Merge pull request #235 from waalt/master

 Add Peak to printed list of supported devices
Bug 866489: address requiring zlib1g-dev:{amd64,i386} on Ubuntu 13.04. r=jlebar
Merge pull request #236 from vicamo/bugzilla/866489/zlib1g-dev-amd64

Bug 866489: address requiring zlib1g-dev:{amd64,i386} on Ubuntu 13.04.
Bug 831147: Add cmake to Mac bootstrap script.

The addition of apitrace introduces a new dependency on cmake.  Make sure
this is properly installed in the bootstrap script.  The wiki will need to
be updated separately.
Merge pull request #237 from wanderview/add-cmake-dep

Bug 831147: Add cmake to Mac bootstrap script.
Make get_about_memory.py work even if busybox is installed on the phone.
Merge pull request #238 from jlebar/get-about-memory-busybox

Make get_about_memory.py work even if busybox is installed on the phone. r=dhylands
Some minor improvements to run-gdb.sh

Added pid to the name of the gdbinit file, just to make sure that there weren't any collisions.
If set -x is enabled int he file, it will also print out the contents of the gdbinit file.
Merge pull request #243 from dhylands/dhylands-run-gdb

Some minor improvements to run-gdb.sh
Merge branch 'master' into master-sgs2