duncathan 8c2519e115 merge conflicts

2015-07-16 04:54:11 -06:00

..

binary_devices

merge conflicts

2015-07-16 04:54:11 -06:00

trinary_devices

merge conflicts

2015-07-16 04:54:11 -06:00

unary_devices

merge conflicts

2015-07-16 04:54:11 -06:00

components_base.dm

fixes things per aran's request

2015-07-16 03:34:18 -06:00