Patch merged into coreboot/master: bfbba64 Inline Makefile.bootblock.inc

the following patch was just integrated into master:
commit bfbba6462f66aaf91af3c59fdb89ee91676351b4
Author: Patrick Georgi 
Date:   Tue Nov 1 18:55:59 2011 +0100

Inline Makefile.bootblock.inc

This was split out when we had separate rules for big bootblock.

Change-Id: Id0a117f6996fb6bdef7bf97e7d80c36f5dec0ad7
    Signed-off-by: Patrick Georgi

Build-Tested: build bot (Jenkins) at Sat Nov  5 12:44:42 2011, giving +1
Reviewed-By: Stefan Reinauer  at Sun Nov  6 18:20:48 2011, giving +2
See http://review.coreboot.org/404 for details.

-gerrit