Merge branch 'chris'
authormicvm <micvm@localhost.localdomain>
Sun, 30 Aug 2009 13:25:58 +0000 (15:25 +0200)
committermicvm <micvm@localhost.localdomain>
Sun, 30 Aug 2009 13:25:58 +0000 (15:25 +0200)
commit1e6a63397be0793240d6cbc7386fc102b40feeef
treea47696dcfcafc7d473c363f974cb817fb8124601
parent99bbc127f5c2b0cfaa69b154d7fc29694c0d88f3
parent462fa8fdfc398f9cd663871895cd3fff90251e3d
Merge branch 'chris'

Conflicts:
hm5843/readme.txt

Resolved conflict