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)
commitfea72637c665f2143adcf8455fffa55160c2cad2
tree101b5fb5e40eb3d0ef8f4b0fd8b574311652d33e
parent53e43d014cb7d5a3bd53dbdbf0e74977e7dda923
parentf3c4b53d5ec6bd2ae0f284c1e6371bff545f0f80
Merge branch 'build_fix' into cris