am 564c9930: am 53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2

Merge commit '564c993069fe049a755be7ecffa510fe64a1917e'

* commit '564c993069fe049a755be7ecffa510fe64a1917e':
  Package blacklist/whitelist file support for Monkey.