Merge ssh://10.0.0.200/zorro/firmerware/home/vanrein/0cpm.org/6bed4/refimpl-01
authorRick van Rein <vanrein@air.opera>
Tue, 20 Mar 2012 11:54:42 +0000 (12:54 +0100)
committerRick van Rein <vanrein@air.opera>
Tue, 20 Mar 2012 11:54:42 +0000 (12:54 +0100)

Trivial merge