Merge pull request #721 from mpapis/master

openSUSE-12.3-x86_64-NET_EN