Merge pull request #2 from wso2/master

merging back to dev
Merge pull request #4 from wso2/master

sync dev repo with the main repo
reverting befc4cd and fa7016a since these has broken CApp functionality in ESB
Merge pull request #6 from wso2-dev/master

sucessfully commited the changes
Timestamp : Wed May 07 20:13:55 IST 2014
https://wso2.org/jenkins-pr-builder/job/carbon-commons/415/