Merge commit 'refs/merge-requests/1' of git://gitorious.org/opensuse/software-o-o...
authorThomas Schmidt <tschmidt@suse.de>
Thu, 31 Mar 2011 12:14:10 +0000 (14:14 +0200)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 31 Mar 2011 12:14:10 +0000 (14:14 +0200)
commitc28e2602c78734787610b3ac8ca76a2cee2f4339
tree0ee96eb0b470591a20731d6bfa62cab861725a7f
parent059d119709a40ab944cd0309074ff131fbb08dd0
parentc4b7a1c71961e91907259435b83e073c2e5798dd
Merge commit 'refs/merge-requests/1' of git://gitorious.org/opensuse/software-o-o into merge-requests/1