Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime

Conflicts:
	repositories/gentoo.conf
Add local slot for ::holliday
Add sys-libs/hei-linux to keywords.conf
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Merge branch 'stage' into prime
Un-keyword virtual/{jdk,jre}:1.7
Merge branch 'stage' into prime
Tweak app-emulation/crossover-bin keywords
XBMC 13
No longer need to mask x11-drivers/nvidia-drivers
Unmask www-client/firefox-32.0

Because www-client/firefox-29.0.1 is gone.
Unmask app-emulation/virtualbox-4.3.16

Because app-emulation/virtualbox-4.3.12 is gone.
www-client/firefox: use system-wide cairo, icu, jpeg and sqlite