Merge commit 'origin/upstream' into juha-devel

author Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>

Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)

committer Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>

Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)
author Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>
Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)
committer Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>
Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)
diff --cc Makefile
Simple merge
diff --cc Makefile.target
Simple merge
diff --cc block.c
Simple merge
diff --cc block.h
Simple merge
diff --cc exec.c
Simple merge
diff --cc hw/boards.h
Simple merge
author	Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>
	Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)
committer	Juha Riihimäki <juhriihi@esdhcp03578.research.nokia.com>
	Tue, 31 Mar 2009 11:02:36 +0000 (14:02 +0300)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.target	patch \|	diff1 \|	diff2 \|	blob \| history
block.c	patch \|	diff1 \|	diff2 \|	blob \| history
block.h	patch \|	diff1 \|	diff2 \|	blob \| history
exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
hw/boards.h	patch \|	diff1 \|	diff2 \|	blob \| history