commit AN2010_016 and AN2010_030
Merge branch 'master' of git://github.com/kalanand/documents