fixing https://wso2.org/jira/browse/IDENTITY-2654
Merge pull request #7 from kdchamil/master

fixing https://wso2.org/jira/browse/IDENTITY-2654 provided by Chamil
Merge pull request #13 from wso2-dev/master

sucessfully commited the changes
Timestamp : Mon Aug 11 19:46:11 IST 2014
https://wso2.org/jenkins-pr-builder/job/carbon-identity/145/