OSDN Git Service

Merge commit 'origin/master' into prelink
authorCarmelo Amoroso <carmelo.amoroso@st.com>
Tue, 14 Dec 2010 13:50:49 +0000 (14:50 +0100)
committerCarmelo Amoroso <carmelo.amoroso@st.com>
Tue, 14 Dec 2010 13:54:26 +0000 (14:54 +0100)
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

Trivial merge