daniceexi 4f3bf457a6 defect 4153: resolve the merge conflict which introduced by commit 899cb5028d		2014-06-04 08:45:42 -04:00
..
perl/xCAT	Support shortname directive for templates that may require it	2014-06-02 16:27:20 -04:00
xcat	defect 4153: resolve the merge conflict which introduced by commit 899cb5028d	2014-06-04 08:45:42 -04:00