904b5995f6eb78f75ac3cb1c59
parent 1d63e726408dfdb3e10ed8f00c383b30ebb333d3
parent a54373eee6e9f5e986a251e852ee1bb83e03671b
author Jesper Nilsson <jesper.nilsson@axis.com> 1225297720 +0100
committer Jesper Nilsson <jesper.nilsson@axis.com> 1225297720 +0100

Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
<