Merge commit 'upstream/3.12'
[debian/elilo] / chooser.h
2008-05-20 Bdale GarbeeImported Upstream version 3.4 upstream/3.4