Merge branch 'master' into devel-3.0
authorNeilBrown <neilb@suse.de>
Tue, 2 Jun 2009 05:28:36 +0000 (15:28 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 2 Jun 2009 05:28:36 +0000 (15:28 +1000)
commit3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb
treeef736cccca9d0c9053dc6437f7d229dfcdd9b23f
parent38a07ed61e58320e18a6c25ab9da4d749d43bdc5
parentc7b474474c793e9a82bd0d84868fdf7367c89696
Merge branch 'master' into devel-3.0

Conflicts:
super0.c
super1.c
Manage.c
Monitor.c