Merge branch 'bug13658-branch'
authorAndreas Jaeger <aj@suse.de>
Thu, 15 Mar 2012 13:21:59 +0000 (14:21 +0100)
committerAndreas Jaeger <aj@suse.de>
Thu, 15 Mar 2012 13:21:59 +0000 (14:21 +0100)
commit25fb532ca52fe3c852522ce4430d58833ae75e4f
tree7bb4e125583555a5805108f417115b1ac2f7ee10
parent9cad04eaf702e0ec133ec24f725958e8946173b0
parentad6e0564b860ba31198ee9ed29828ce7b4b55d21
Merge branch 'bug13658-branch'