Merge branch 'master' into for-erwan
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 11 Apr 2009 17:46:38 +0000 (10:46 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Sat, 11 Apr 2009 17:46:38 +0000 (10:46 -0700)
commit51c43d5e58b0f88a2392102015c089109307fa9b
tree059e8925ccb5410145c1c823f6a8f8d956ef3002
parent55de9cbffb0377dec13860a4aeb7a66e4c2b500e
parent3b80c2699cde4e159bc9af15308c480acf2c836d
Merge branch 'master' into for-erwan

Conflicts:

com32/hdt/Makefile
com32/hdt/hdt-common.c
com32/modules/Makefile