merge with master
[platform/upstream/hplip.git] / scan /
2013-03-12 Jinkun JangTizen 2.1 base