Merge commit '67ebb60' into stable
authorJiri Slaby <jslaby@suse.cz>
Mon, 11 Feb 2013 22:47:39 +0000 (23:47 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 11 Feb 2013 22:47:39 +0000 (23:47 +0100)
commitaeb27143cd2a8d0af09da35287f852f3a739f8b5
tree057a95ec6b2998c5ad224b63d4aef5f41b0cbc01
parentd5cefdd8eccaa8ce0ad6adf678a41673385e977c
parent67ebb6029584fc783936b97259907fa43d446789
Merge commit '67ebb60' into stable