Merge commit '32a7d1d973e00618ffb4c21c48dba66d670a0374' into openSUSE-12.3
authorJiri Slaby <jslaby@suse.cz>
Fri, 11 Jan 2013 19:14:50 +0000 (20:14 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 11 Jan 2013 19:14:50 +0000 (20:14 +0100)
commitb8bb5ac7110f3685ebe37938fb6014ccbaa64e0b
tree5672cf7f798910199b85a009aa71761e7ffbd0b6
parentd62551bdd33021c3ad727452e43b2d309c7bc757
parent32a7d1d973e00618ffb4c21c48dba66d670a0374
Merge commit '32a7d1d973e00618ffb4c21c48dba66d670a0374' into openSUSE-12.3