Merge branch 'build_fix' into cris
authorJesper Nilsson <jesper@jni.nu>
Mon, 30 Jun 2008 22:13:54 +0000 (00:13 +0200)
committerJesper Nilsson <jesper@jni.nu>
Mon, 30 Jun 2008 22:13:54 +0000 (00:13 +0200)

Trivial merge